diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 09:56:35 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 09:56:35 -0800 |
| commit | 9997587e390cc309e71cffb55f5cf6a9ad90da69 (patch) | |
| tree | fc54491e875a31799cfb41acde73363617ec586c /indra/newview/llchathistory.cpp | |
| parent | 9a4d075f3b8ab1ccf760187beeb81f9bf17e69b1 (diff) | |
| parent | da08cc05af85ac334cabd943a5d9fcbcaa1500b6 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index dd9f0c2ebe..f1e7e622b3 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -34,6 +34,7 @@ #include "llinstantmessage.h" +#include "llimview.h" #include "llchathistory.h" #include "llcommandhandler.h" #include "llpanel.h" @@ -219,6 +220,7 @@ public: void setup(const LLChat& chat,const LLStyle::Params& style_params) { mAvatarID = chat.mFromID; + mSessionID = chat.mSessionID; mSourceType = chat.mSourceType; gCacheName->get(mAvatarID, FALSE, boost::bind(&LLChatHistoryHeader::nameUpdatedCallback, this, _1, _2, _3, _4)); if(chat.mFromID.isNull()) @@ -341,6 +343,11 @@ protected: menu->setItemEnabled("Remove Friend", false); } + if (mSessionID == LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, mAvatarID)) + { + menu->setItemVisible("Send IM", false); + } + menu->buildDrawLabels(); menu->updateParent(LLMenuGL::sMenuContainer); LLMenuGL::showPopup(this, menu, x, y); @@ -380,6 +387,7 @@ protected: std::string mFirstName; std::string mLastName; std::string mFrom; + LLUUID mSessionID; S32 mMinUserNameWidth; }; |