diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
| commit | b68d1a0f50c073257fb48692b666bb692d0c9981 (patch) | |
| tree | 46ca2d8a49a2fd8dc3d98db6da926faf84c31b8a /indra/newview/llinventoryobserver.cpp | |
| parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
| parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) | |
Merge viewer-pre-beta -> seraph-viewer-pre-beta
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
| -rw-r--r-- | indra/newview/llinventoryobserver.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 0fd4b2bee5..6bf19e346d 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -572,16 +572,7 @@ void LLInventoryAddedObserver::changed(U32 mask) // the network, figure out which item was updated. LLMessageSystem* msg = gMessageSystem; - std::string msg_name; - if (mMessageName.empty()) - { - msg_name = msg->getMessageName(); - } - else - { - msg_name = mMessageName; - } - + std::string msg_name = msg->getMessageName(); if (msg_name.empty()) { return; |