From fc9912070b847a7c4a45a94562bde23b5210b3cd Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Wed, 24 Jun 2009 18:19:23 -0700
Subject: two more llstartup.cpp merge issues.
---
indra/newview/llstartup.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0e5cb5905b..f0f056652a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1115,7 +1115,6 @@ bool idle_startup()
LLWaterParamManager::initClass();
LLViewerObject::initVOClasses();
- LLWearable::initClass();
// Initialize all our tools. Must be done after saved settings loaded.
// NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.
@@ -1540,8 +1539,6 @@ bool idle_startup()
LLAvatarTracker::instance().addBuddyList(list);
}
- options.clear();
-
bool show_hud = false;
LLSD tutorial_setting = response["tutorial_setting"];
if(tutorial_setting.isDefined())
@@ -2914,7 +2911,7 @@ bool process_login_success_response()
LLUUID inv_root_folder_id = response["inventory-root"][0]["folder_id"];
if(inv_root_folder_id.notNull())
{
- gAgent.mInventoryRootID = inv_root_folder_id;
+ gAgent.getInventoryRootID() = inv_root_folder_id;
//gInventory.mock(gAgent.getInventoryRootID());
}
@@ -3002,7 +2999,7 @@ bool process_login_success_response()
&& gAgentSessionID.notNull()
&& gMessageSystem->mOurCircuitCode
&& gFirstSim.isOk()
- && gAgent.mInventoryRootID.notNull())
+ && gAgent.getInventoryRootID().notNull())
{
success = true;
}
--
cgit v1.2.3