diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
| commit | 1147cb1afbc21e1251614895844e95bca9b6b5bc (patch) | |
| tree | da01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/llcallfloater.cpp | |
| parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
| parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) | |
Automated merge from trunk
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index da4f2be567..f1b1efc2e0 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -115,6 +115,9 @@ LLCallFloater::LLCallFloater(const LLSD& key) mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL); LLVoiceClient::getInstance()->addObserver(this); LLTransientFloaterMgr::getInstance()->addControlView(this); + + // force docked state since this floater doesn't save it between recreations + setDocked(true); } LLCallFloater::~LLCallFloater() |