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

Hook up isWordsName() in FSFloaterNearbyChat, add some settings that got missed in the merge

master
Cinders 2013-07-05 07:17:54 -06:00
parent dc1242007e
commit 712eeb7faa
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1577,6 +1577,28 @@
<string>http://search.metaverseink.com/opensim/results.jsp?query=[QUERY]&amp;submit=[CATEGORY]</string>
</map>
<key>IMShowTime</key>
<map>
<key>Comment</key>
<string>Enable(disable) timestamp showing in the chat.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>IMShowNamesForP2PConv</key>
<map>
<key>Comment</key>
<string>Enable(disable) showing of a names in the chat.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>CrashHostUrl</key>
<map>
<key>Comment</key>

3
indra/newview/fsfloaternearbychat.cpp
View File

@ -493,7 +493,8 @@ void FSFloaterNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
nearby_chat->updateChatHistoryStyle();
}
bool isWordsName(const std::string& name)
//static
bool FSFloaterNearbyChat::isWordsName(const std::string& name)
{
// checking to see if it's display name plus username in parentheses
S32 open_paren = name.find(" (", 0);

1
indra/newview/fsfloaternearbychat.h
View File

@ -96,6 +96,7 @@ public:
BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
void updateFSUseNearbyChatConsole(const LLSD &data);
static bool isWordsName(const std::string& name);
private:
void getAllowedRect (LLRect& rect);

4
indra/newview/llfloaterconversationpreview.cpp
View File

@ -167,8 +167,10 @@ void LLFloaterConversationPreview::showHistory()
}
else if (from_id.isNull())
{
// FIXME: Hook this up to our nearby chat <FS:CR>
// <FS:CR> [Firestorm Communications UI ]
//chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
chat.mSourceType = FSFloaterNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
// </FS:CR>
}
LLSD chat_args;