diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 10:07:40 -0400 |
| commit | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch) | |
| tree | 3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/newview/llinventoryobserver.cpp | |
| parent | d534c8009f2573400a21c19b00691536fc3cc23f (diff) | |
| parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
merged from 2.6.4-start tag in viewer-development
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; |