diff options
| author | James Cook <james@lindenlab.com> | 2010-02-04 20:38:40 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-04 20:38:40 -0800 |
| commit | c0b7c93c18783d6a426cf43265f34c86bdeceb4a (patch) | |
| tree | bd7ece31856a0e4d54e6be0ace990930301ed9d3 /indra/newview/llnotificationhandlerutil.cpp | |
| parent | 88350edbcbec615f3b15fc82bd5ce4005621ac6f (diff) | |
Converted all gCacheName->getName to getFullName for SLID compatibility
Also eliminated notification "ObjectGiveItemUnknownUser" because the
SLURL-based name lookup will always retrieve the user name.
Fixed a bug with ObjectGiveItem where the SLURL would be incorrect
for a group.
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index b8e0892b02..4d1a8fcb04 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -45,8 +45,8 @@ using namespace LLNotificationsUI; const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), REVOKED_MODIFY_RIGHTS("RevokedModifyRights"), OBJECT_GIVE_ITEM( - "ObjectGiveItem"), OBJECT_GIVE_ITEM_UNKNOWN_USER( - "ObjectGiveItemUnknownUser"), PAYMENT_RECIVED("PaymentRecived"), + "ObjectGiveItem"), + PAYMENT_RECIVED("PaymentRecived"), ADD_FRIEND_WITH_MESSAGE("AddFriendWithMessage"), USER_GIVE_ITEM("UserGiveItem"), INVENTORY_ACCEPTED("InventoryAccepted"), @@ -157,8 +157,7 @@ void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification, bool to_fi "SESSION_NAME") ? notification->getPayload()["SESSION_NAME"].asString() : name; // don't create IM p2p session with objects, it's necessary condition to log - if (notification->getName() != OBJECT_GIVE_ITEM && notification->getName() - != OBJECT_GIVE_ITEM_UNKNOWN_USER) + if (notification->getName() != OBJECT_GIVE_ITEM) { LLUUID from_id = notification->getPayload()["from_id"]; |