diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-28 17:38:34 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-28 17:38:34 -0700 |
| commit | d1ada50b9e6f9a357d04498cf138208ee7653d7c (patch) | |
| tree | ce023fc35c03a105d023028798f2bc423cbe4426 /indra/newview/llimfloatercontainer.cpp | |
| parent | 7fc33cc47fdc080bbc7674cf118011b689ba1485 (diff) | |
| parent | 8b2ed2e2050fcb8836be120902f44417613adb13 (diff) | |
Mer ge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llimfloatercontainer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 45d63ce4f9..ffbdae305b 100755..100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -464,6 +464,7 @@ void LLIMFloaterContainer::setVisible(BOOL visible) // *TODO: find a way to move this to XML as a default panel or something like that LLSD name("nearby_chat"); LLFloaterReg::toggleInstanceOrBringToFront(name); + LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat")->addToHost(); } } |