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

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-02-12 18:21:20 -06:00
parent 1253fc4746 72c4c52372
commit 0a5bcd8eb7
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llmessage/llcachename.cpp
View File

@@ -521,7 +521,8 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
{
std::string first_name, last_name;
BOOL res = getName(id, first_name, last_name);
fullname = first_name + " " + last_name;
if(res)
fullname = first_name + " " + last_name;
return res;
}

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

@@ -20,6 +20,17 @@
<key>Value</key>
<string />
</map>
<key>ShowcaseURLDefault</key>
<map>
<key>Comment</key>
<string>URL to load for the Showcase tab in Second Life</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://secondlife.com/app/showcase/index.php?</string>
</map>
<key>CheckForGridUpdates</key>
<map>

2
indra/newview/llimpanel.cpp
View File

@@ -1620,7 +1620,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
{
std::string show_name = name;
LLAvatarName avatar_name;
if ((LLUUID::null != source) &&
if (source.notNull() &&
LLAvatarNameCache::get(source, &avatar_name))
{
static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);

7
indra/newview/llimview.cpp
View File

@@ -577,6 +577,13 @@ void LLIMMgr::addMessage(
other_participant_id = LLUUID::null;
}
//This is for InWorldz glitch.
if( other_participant_id == session_id )
{
other_participant_id = LLUUID::null;
}
LLFloaterIMPanel* floater;
LLUUID new_session_id = session_id;
if (new_session_id.isNull())

2
indra/newview/llpanellogin.cpp
View File

@@ -849,7 +849,7 @@ void LLPanelLogin::refreshLoginPage()
// kick off a request to grab the url manually
gResponsePtr = LLIamHereLogin::build(sInstance);
std::string login_page = "http://phoenixviewer.com/app/login/"; //gHippoGridManager->getConnectedGrid()->getLoginPage();
std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
if (!login_page.empty()) {
LLHTTPClient::head(login_page, gResponsePtr);
} else {

13
indra/newview/llviewermessage.cpp
View File

@@ -1941,18 +1941,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
true);
// pretend this is chat generated by self, so it does not show up on screen
std::string prepend_msg;
if (gAgent.isInGroup(session_id)&& gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"))
{
prepend_msg = "[";
prepend_msg += std::string((char*)binary_bucket);
prepend_msg += "] ";
}
else
{
prepend_msg = std::string("IM: ");
}
chat.mText = prepend_msg + name + separator_string + message.substr(message_offset);
chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
LLFloaterChat::addChat( chat, TRUE, TRUE );
}
else if (from_id.isNull())