diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
| commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
| tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/llinventoryobserver.cpp | |
| parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
| parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) | |
merge up from viewer-development (with changes for storm-160 backed out)
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; |