summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Stone <stone@lindenlab.com>2011-08-10 11:55:05 -0700
committerAaron Stone <stone@lindenlab.com>2011-08-10 11:55:05 -0700
commitdfcd11e51e68922b5158ef4076721f7c66a3d637 (patch)
tree2ae0e5ef7b34a860e5004d1be6a35f1059128056
parente1532afb1267b2012a6fbb9b72b09ab80a85f763 (diff)
CHOP-757 Ask for the inventory-basic login option and dump its return id to llinfo.
-rw-r--r--indra/newview/lllogininstance.cpp1
-rw-r--r--indra/newview/llstartup.cpp6
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 00de6a86e1..b20f89aa7c 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -568,6 +568,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
else
{
requested_options.append("basic-mode");
+ requested_options.append("inventory-basic");
}
#endif
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index b390c933f7..1cbf99dbe7 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1543,6 +1543,12 @@ bool idle_startup()
}
}
+ LLSD inv_basic = response["inventory-basic"];
+ if(inv_basic.isDefined())
+ {
+ llinfos << "Basic inventory root folder id is " << inv_basic["folder_id"] << llendl;
+ }
+
LLSD buddy_list = response["buddy-list"];
if(buddy_list.isDefined())
{