From ec2219724023144a0098199229aee7947a29af08 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 31 Jul 2009 15:32:03 -0700
Subject: [PATCH] Fixups for conflicts that got dropped in the changeset
486d51877332 merge of viewer-2.0.0-3 with login-api. Mostly code that had
been modified in viewer-2.0.0-3 that had been moved elsewhere in login-api.
---
indra/newview/lllogininstance.cpp | 2 +-
indra/newview/llstartup.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 16192079a20..f967fcaf971 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -296,7 +296,7 @@ void LLLoginInstance::updateApp(bool mandatory, const std::string& auth_msg)
{
// store off config state, as we might quit soon
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
- gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
+ LLUIColorTable::instance().saveUserSettings();
std::ostringstream message;
std::string msg;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 822c12536e7..cc933fbf1ec 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -204,7 +204,7 @@ bool gAgentMovementCompleted = false;
std::string SCREEN_HOME_FILENAME = "screen_home.bmp";
std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
-LLPointer<LLImageGL> gStartImageGL;
+LLPointer<LLViewerTexture> gStartTexture;
//
// Imported globals
@@ -1487,7 +1487,7 @@ bool idle_startup()
LLSD id = inv_lib_owner[0]["agent_id"];
if(id.isDefined())
{
- gInventory.setLibraryOwnerID( LLUUID(id.asUUID());
+ gInventory.setLibraryOwnerID( LLUUID(id.asUUID()));
}
}
@@ -2915,7 +2915,7 @@ bool process_login_success_response()
LLUUID inv_root_folder_id = response["inventory-root"][0]["folder_id"];
if(inv_root_folder_id.notNull())
{
- gAgent.getInventoryRootID() = inv_root_folder_id;
+ gInventory.setRootFolderID(inv_root_folder_id);
//gInventory.mock(gAgent.getInventoryRootID());
}
@@ -3003,7 +3003,7 @@ bool process_login_success_response()
&& gAgentSessionID.notNull()
&& gMessageSystem->mOurCircuitCode
&& gFirstSim.isOk()
- && gAgent.getInventoryRootID().notNull())
+ && gInventory.getRootFolderID().notNull())
{
success = true;
}
--
GitLab