Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test

1 files changed, 25 insertions, 6 deletions

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 197162487d..fd226d656c 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -117,12 +117,20 @@ LLExperienceHandler gExperienceHandler;
 
 LLFloaterExperienceProfile::LLFloaterExperienceProfile(const LLSD& data)
     : LLFloater(data)
-    , mExperienceId(data.asUUID())
     , mSaveCompleteAction(NOTHING)
     , mDirty(false)
     , mForceClose(false)
 {
-
+    if (data.has("experience_id"))
+    {
+        mExperienceId = data["experience_id"].asUUID();
+        mPostEdit = data.has("edit_experience") && data["edit_experience"].asBoolean();
+    }
+    else
+    {
+        mExperienceId = data.asUUID();
+        mPostEdit = false;
+    }
 }
 
 
@@ -329,7 +337,13 @@ BOOL LLFloaterExperienceProfile::postBuild()
 
     LLEventPumps::instance().obtain("experience_permission").listen(mExperienceId.asString()+"-profile", 
         boost::bind(&LLFloaterExperienceProfile::experiencePermission, getDerivedHandle<LLFloaterExperienceProfile>(this), _1));
-    
+
+    if (mPostEdit && mExperienceId.notNull())
+    {
+        mPostEdit = false;
+        changeToEdit();
+    }
+
     return TRUE;
 }
 
@@ -356,9 +370,7 @@ bool LLFloaterExperienceProfile::experiencePermission( LLHandle<LLFloaterExperie
 
 void LLFloaterExperienceProfile::onClickEdit()
 {
-    LLTabContainer* tabs = getChild<LLTabContainer>("tab_container");
-
-    tabs->selectTabByName("edit_panel_experience_info");
+    changeToEdit();
 }
 
 
@@ -829,6 +841,13 @@ void LLFloaterExperienceProfile::changeToView()
     }
 }
 
+void LLFloaterExperienceProfile::changeToEdit()
+{
+    LLTabContainer* tabs = getChild<LLTabContainer>("tab_container");
+
+    tabs->selectTabByName("edit_panel_experience_info");
+}
+
 void LLFloaterExperienceProfile::onClickLocation()
 {
     LLViewerRegion* region = gAgent.getRegion();