livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Tank_Master 2013-11-23 20:23:19 -08:00
parent 3603c4f992 d3ef620bf9
commit 9726be4c48
4 changed files with 28 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -21667,6 +21667,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>120</integer>
</map>
<key>FSUseSingleLineChatEntry</key>
<map>
<key>Comment</key>
<string>Use single line chat entry instead of auto-expanding chat entry</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

1
indra/newview/fsfloaterim.cpp
View File

@ -826,6 +826,7 @@ BOOL FSFloaterIM::postBuild()
mInputEditor->setCommitOnFocusLost( FALSE );
mInputEditor->setPassDelete(TRUE);
mInputEditor->setFont(LLViewerChat::getChatFont());
mInputEditor->enableSingleLineMode(gSavedSettings.getBOOL("FSUseSingleLineChatEntry"));
childSetCommitCallback("chat_editor", onSendMsg, this);

1
indra/newview/fsfloaternearbychat.cpp
View File

@ -150,6 +150,7 @@ BOOL FSFloaterNearbyChat::postBuild()
mInputEditor->setPassDelete(TRUE);
mInputEditor->setFont(LLViewerChat::getChatFont());
mInputEditor->setLabel(getString("chatbox_label"));
mInputEditor->enableSingleLineMode(gSavedSettings.getBOOL("FSUseSingleLineChatEntry"));
}
mChatLayoutPanel = getChild<LLLayoutPanel>("chat_layout_panel");
mInputPanels = getChild<LLLayoutStack>("input_panels");

72
indra/newview/fsnearbychatcontrol.cpp
View File

@ -27,72 +27,30 @@
#include "llviewerprecompiledheaders.h"
// llui
#include "lllineeditor.h"
#include "llmenugl.h"
#include "llspinctrl.h"
// newview
#include "fsnearbychatcontrol.h"
#include "fsnearbychathub.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaternearbychat.h"
#include "fsfloaternearbychat.h"
// </FS:Ansariel> [FS communication UI]
// #include "llviewercontrol.h"
// #include "llviewerwindow.h"
// #include "llrootview.h"
//#include "llchatitemscontainerctrl.h"
// #include "lliconctrl.h"
#include "llspinctrl.h"
// #include "llfloatersidepanelcontainer.h"
// #include "llfocusmgr.h"
// #include "lllogchat.h"
// #include "llresizebar.h"
// #include "llresizehandle.h"
#include "llmenugl.h"
#include "llviewermenu.h"//for gMenuHolder
#include "llagent.h" // gAgent
#include "llagentcamera.h" // gAgentCamera
#include "llfloaterimnearbychathandler.h"
// #include "llnearbychatbar.h" // <FS:Zi> Remove floating chat bar
// #include "llchannelmanager.h"
#include "llagent.h" // gAgent
#include "llagentcamera.h" // gAgentCamera
// #include "llchathistory.h"
// #include "llstylemap.h"
// #include "llavatarnamecache.h"
// #include "lldraghandle.h"
// #include "llnearbychatbar.h" // <FS:Zi> Remove floating chat bar
// #include "llfloaterreg.h"
// #include "lltrans.h"
// IM
// #include "llbutton.h"
// #include "lllayoutstack.h"
// #include "llimfloatercontainer.h"
// #include "llimfloater.h"
#include "lllineeditor.h"
#include "llviewermenu.h" //for gMenuHolder
//AO - includes for textentry
#include "rlvhandler.h"
#include "llcommandhandler.h"
#include "llkeyboard.h"
#include "llgesturemgr.h"
#include "llmultigesture.h"
#include "llautoreplace.h"
// #include "llconsole.h"
// #include "fscontactsfloater.h"
// <FS:Zi> Moved nearby chat functionality here for now
// #include "chatbar_as_cmdline.h"
// #include "llanimationstates.h" // ANIM_AGENT_WHISPER, ANIM_AGENT_TALK, ANIM_AGENT_SHOUT
// #include "llviewerstats.h"
// </FS:Zi>
// <FS:CR> FIRE-3192 - Name Prediction
#include "llworld.h"
#include "llcommandhandler.h"
#include "llgesturemgr.h"
#include "llkeyboard.h"
#include "llmultigesture.h"
#include "llworld.h" // <FS:CR> FIRE-3192 - Name Prediction
#include "rlvhandler.h"
static const U32 NAME_PREDICTION_MINIMUM_LENGTH = 3;
// </FS:CR>
static LLDefaultChildRegistry::Register<FSNearbyChatControl> r("fs_nearby_chat_control");