diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:44:18 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:44:18 +0000 |
| commit | 5707b71d090306d05dd09933985294e8c7d136a9 (patch) | |
| tree | 08b8b0e0abc9c46e73263ff764234d0cb451a4bf /indra/newview | |
| parent | 8fec8c46df9533c30bf97bc6da0f1f8701c440e9 (diff) | |
CID-90
Checker: FORWARD_NULL
Function: LLCallingCardBridge::buildContextMenu(LLMenuGL &, unsigned int)
File: /indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 0b0e3be675..59ca6063c8 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3627,9 +3627,13 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags) LLInventoryItem* item = getItem(); BOOL good_card = (item - && (LLUUID::null != item->getCreatorUUID()) - && (item->getCreatorUUID() != gAgent.getID())); - BOOL user_online = (LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID())); + && (LLUUID::null != item->getCreatorUUID()) + && (item->getCreatorUUID() != gAgent.getID())); + BOOL user_online = FALSE; + if (item) + { + user_online = (LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID())); + } items.push_back(std::string("Send Instant Message Separator")); items.push_back(std::string("Send Instant Message")); items.push_back(std::string("Offer Teleport...")); |