diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
| commit | 73eec0321f79bb7ceeb2b2027e63660158413e5e (patch) | |
| tree | e264a8962c34f0768bed34500d4af1af8a0eba27 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | be61b5be2f4089e12ca25ca1ece13bd0fdaea543 (diff) | |
| parent | 01a154809d650f7905aaa208150a1070b19e5c2b (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 61772b4bb7..e6340e0fa3 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -323,12 +323,12 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - LLNearbyChat::getInstance()->showHistory(); + LLNearbyChat::instance().showHistory(); return FALSE; } } - LLNearbyChat::getInstance()->showHistory(); + LLNearbyChat::instance().showHistory(); return LLPanel::handleMouseUp(x,y,mask); } |