Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Ascent progress - title picker

Browse Source
This commit is contained in:
Siana Gearz
2010-11-08 22:59:46 +01:00
parent 21e10551b3 4763ee7424
commit d7a1575ad2
30 changed files with 2004 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llimpanel.cpp
View File

@@ -59,6 +59,7 @@
#include "llfloaterchat.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llcheckboxctrl.h"
#include "llnotify.h"
#include "llresmgr.h"
#include "lltabcontainer.h"
@@ -1283,6 +1284,8 @@ BOOL LLFloaterIMPanel::postBuild()
if (checkRequirements())
{
mRPMode = false;
mInputEditor = getChild<LLLineEditor>("chat_editor");
mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
@@ -1297,6 +1300,7 @@ BOOL LLFloaterIMPanel::postBuild()
childSetAction("profile_tele_btn", onClickTeleport, this);
childSetAction("group_info_btn", onClickGroupInfo, this);
childSetAction("history_btn", onClickHistory, this);
childSetCommitCallback("rp_mode", onRPMode, this);
childSetAction("start_call_btn", onClickStartCall, this);
childSetAction("end_call_btn", onClickEndCall, this);
@@ -1796,6 +1800,13 @@ void LLFloaterIMPanel::onClickTeleport( void* userdata )
}
}
// static
void LLFloaterIMPanel::onRPMode(LLUICtrl* source, void* user_data)
{
LLFloaterIMPanel* self = (LLFloaterIMPanel*) user_data;
self->mRPMode = source->getValue().asBoolean();
}
// static
void LLFloaterIMPanel::onClickHistory( void* userdata )
{
@@ -2022,7 +2033,7 @@ void LLFloaterIMPanel::sendMsg()
if (mInputEditor) mInputEditor->updateHistory();
// Truncate and convert to UTF8 for transport
std::string utf8text = wstring_to_utf8str(text);
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1))
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode)
{
// Chalice - OOC autoclosing patch based on code by Henri Beauchamp
int needsClosingType=0;
@@ -2066,7 +2077,12 @@ void LLFloaterIMPanel::sendMsg()
utf8text.replace(0, 1, "/me ");
}
}
utf8text = utf8str_truncate(utf8text, MAX_MSG_BUF_SIZE - 1);
std::string prefix = utf8text.substr(0, 4);
if (prefix != "/me " && prefix != "/me'")
if (mRPMode) utf8text = "[[" + utf8text + "]]";
// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))