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

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

Browse Source 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2012-11-29 11:54:41 -06:00
parent 3a4b6cf6b6 e17405d80a
commit 794dbacea3
358 changed files with 27109 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llstartup.cpp
View File

@@ -32,6 +32,7 @@
#include "llviewerprecompiledheaders.h"
#include <boost/algorithm/string.hpp>
#include "llstartup.h"
#if LL_WINDOWS
@@ -894,7 +895,7 @@ bool idle_startup()
}
else
{
LLPanelLogin::setFields(firstname, lastname, password, login_history);
LLPanelLogin::setFields(firstname, lastname, password);
// <edit>
gFullName = utf8str_tolower(firstname + " " + lastname);
// </edit>
@@ -1595,10 +1596,11 @@ bool idle_startup()
if(process_login_success_response(password))
{
std::string name = firstname;
std::string last_name = lastname;
LLStringUtil::toLower(last_name);
if(last_name != "resident")
if (!gHippoGridManager->getCurrentGrid()->isSecondLife() ||
!boost::algorithm::iequals(lastname, "Resident"))
{
name += " " + lastname;
}
gViewerWindow->getWindow()->setTitle(LLAppViewer::instance()->getWindowTitle() + "- " + name);
// Pass the user information to the voice chat server interface.
gVoiceClient->userAuthorized(firstname, lastname, gAgentID);