From 7d88f8814b2f4f409d182a6cabcd62b04ee4df89 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 5 Nov 2015 19:40:26 +0200
Subject: SL-192 Edit Experience Profile shows up once an Exp is acquired

---
 indra/newview/llfloaterexperienceprofile.cpp | 29 +++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llfloaterexperienceprofile.cpp')

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 197162487d..4d60d01922 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;
+    }
 }
 
 
@@ -356,9 +364,7 @@ bool LLFloaterExperienceProfile::experiencePermission( LLHandle<LLFloaterExperie
 
 void LLFloaterExperienceProfile::onClickEdit()
 {
-    LLTabContainer* tabs = getChild<LLTabContainer>("tab_container");
-
-    tabs->selectTabByName("edit_panel_experience_info");
+    changeToEdit();
 }
 
 
@@ -615,6 +621,12 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     mDirty=false;
     mForceClose = false;
     getChild<LLButton>(BTN_SAVE)->setEnabled(mDirty);
+
+    if (mPostEdit)
+    {
+        mPostEdit = false;
+        changeToEdit();
+    }
 }
 
 void LLFloaterExperienceProfile::setPreferences( const LLSD& content )
@@ -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();
-- 
cgit v1.2.3


From 17158103dd3a0cf87c7d30bd5c453cf5d1fa7bad Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 24 Nov 2015 20:14:14 +0200
Subject: SL-192 Edit Experience Profile shows up once an Exp is acquired

---
 indra/newview/llfloaterexperienceprofile.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llfloaterexperienceprofile.cpp')

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 4d60d01922..fd226d656c 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -337,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;
 }
 
@@ -621,12 +627,6 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     mDirty=false;
     mForceClose = false;
     getChild<LLButton>(BTN_SAVE)->setEnabled(mDirty);
-
-    if (mPostEdit)
-    {
-        mPostEdit = false;
-        changeToEdit();
-    }
 }
 
 void LLFloaterExperienceProfile::setPreferences( const LLSD& content )
-- 
cgit v1.2.3