STORM-68 Reapply changes to inventory processing lost in the merge.

Move call to updateCap back to where it was.  The place it was moved
to was too early in the login sequence and was causing a crash.

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index dc4969f5e6..4923420a3e 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -175,15 +175,18 @@ public:
 
 void LLFloaterPermsDefault::updateCap(bool alwaysUpdate)
 {
+llwarns << "DBG start" << llendl;
 	if(!alwaysUpdate && mCapSent)
 	{
 		return;
 	}
 
+llwarns << "DBG getRegion" << llendl;
 	std::string object_url = gAgent.getRegion()->getCapability("DefaultObjectPermissions");
 
 	if(!object_url.empty())
 	{
+llwarns << "DBG post" << llendl;
 		LLSD report = LLSD::emptyMap();
 		report["Group"] = (LLSD::Integer)LLFloaterPerms::getGroupPerms(sCategoryNames[CAT_OBJECTS]);
 		report["Everyone"] = (LLSD::Integer)LLFloaterPerms::getEveryonePerms(sCategoryNames[CAT_OBJECTS]);