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

Reinstate option to mark nameless objects as such

Ansariel 2013-02-25 11:09:08 +01:00
parent 4db8c3f43d
commit 45a1cf9f17
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llviewermessage.cpp
View File

@ -3962,7 +3962,27 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
else
{
chat.mFromName = from_name;
// <FS:KC> Objects with no name get renamed to NO_NAME_OBJECT so the object profile is still accessable
//chat.mFromName = from_name;
static const boost::regex whitespace_exp("^\\s*$");
if (chat.mSourceType == CHAT_SOURCE_OBJECT && boost::regex_search(from_name, whitespace_exp))
{
//[FIRE-2434 Mark Unamed Objects based on setting
static LLCachedControl<bool> FSMarkObjects(gSavedSettings, "FSMarkObjects");
if (FSMarkObjects)
{
chat.mFromName = LLTrans::getString("no_name_object");
}
else
{
chat.mFromName = "";
}
}
else
{
chat.mFromName = from_name;
}
// </FS:KC>
}
BOOL is_busy = gAgent.getBusy();