diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-11 17:04:58 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-11 17:04:58 +0300 |
| commit | ec726c3a3ecbefd34008cd735f455c7947b67246 (patch) | |
| tree | 3c97df5de86dcabf017058f893e4cc95f7ef12db /indra | |
| parent | cdb57cb299097b203581a6ef99840350831c321c (diff) | |
CHUI-119 WIP Fixed some bugs
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llstartup.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 320a602916..65fd6d7019 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -63,7 +63,7 @@ #include "llmemorystream.h" #include "llmessageconfig.h" #include "llmoveview.h" -#include "llnearbychat.h" +#include "llimfloatercontainer.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llteleporthistory.h" @@ -1376,6 +1376,10 @@ bool idle_startup() LLVoiceClient::getInstance()->updateSettings(); display_startup(); + // create a container's instance for start a controlling conversation windows + // by the voice's events + LLIMFloaterContainer::getInstance(); + // *Note: this is where gWorldMap used to be initialized. // register null callbacks for audio until the audio system is initialized diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 21fc2d25d4..e5e005e36f 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -236,10 +236,9 @@ </layout_panel> </layout_stack> </panel> - <panel width="228" + <panel width="225" height="31" - left="4" - right="4" + left="4" name="bottom_panel" bottom="-1" follows="left|right|bottom" @@ -254,7 +253,7 @@ layout="bottomleft" name="chat_editor" tab_group="3" - width="240"> + width="220"> </line_editor> </panel> </layout_panel> |