diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
| commit | 3af9d7c0535c8d94b194952c98196bac1d8c3dda (patch) | |
| tree | 68b347e9303f814de271cc27f38f19ae5a6fa4e2 /indra/newview/llimfloatercontainer.cpp | |
| parent | b882fe3b8dde9338c092922672015f975ca09587 (diff) | |
| parent | ad4ae5583534197cb00c13d769e504fcde4d19d5 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 04fb2f3b9a..10188febab 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -96,8 +96,7 @@ void LLIMFloaterContainer::onOpen(const LLSD& key) // If there's *no* conversation open so far, we force the opening of the nearby chat conversation // *TODO: find a way to move this to XML as a default panel or something like that LLSD name("chat_bar"); - LLSD key(""); - LLFloaterReg::toggleInstanceOrBringToFront(name,key); + LLFloaterReg::toggleInstanceOrBringToFront(name); } /* if (key.isDefined()) |