Fixed enabled checkbox in the edit experience profile floater

2 files changed, 20 insertions, 7 deletions

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 49dd2a59ac..ec2e7f0f10 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -379,7 +379,7 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
     
     LLCheckBoxCtrl* enable = getChild<LLCheckBoxCtrl>(EDIT BTN_ENABLE);
     S32 properties = mExperienceDetails[LLExperienceCache::PROPERTIES].asInteger();
-    enable->set(properties & LLExperienceCache::PROPERTY_DISABLED); 
+    enable->set(!(properties & LLExperienceCache::PROPERTY_DISABLED)); 
 
     enable = getChild<LLCheckBoxCtrl>(EDIT BTN_PRIVATE);
     enable->set(properties & LLExperienceCache::PROPERTY_PRIVATE);  
@@ -408,7 +408,14 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 
             child = getChild<LLTextBox>(TF_MRKT);
             child->setText(value);
-            marketplacePanel->setVisible(TRUE);
+            if(value.size())
+            {
+                marketplacePanel->setVisible(TRUE);
+            }
+            else
+            {
+                marketplacePanel->setVisible(FALSE);
+            }
         }
         else
         {
@@ -421,11 +428,15 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
         if(data.has(IMG_LOGO))
         {
             LLTextureCtrl* logo = getChild<LLTextureCtrl>(IMG_LOGO);
-            logo->setImageAssetID(data[IMG_LOGO].asUUID());
+
+            LLUUID id = data[IMG_LOGO].asUUID();
+            logo->setImageAssetID(id);
             imagePanel->setVisible(TRUE);
 
             logo = getChild<LLTextureCtrl>(EDIT IMG_LOGO);
             logo->setImageAssetID(data[IMG_LOGO].asUUID());
+
+            imagePanel->setVisible(id.notNull());
         }
     }
     else
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 8cf9714305..a3408c5e58 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -6,7 +6,9 @@
   enabled="true"
   can_resize="true"
   title="EXPERIENCE PROFILE"
-  width="358">
+  min_width="325"
+  width="358"
+  height="580">
   <floater.string
     name="maturity_icon_general">
     "Parcel_PG_Light"
@@ -44,7 +46,7 @@
     <panel
       background_visible="true"
       follows="all"
-      height="570"
+      height="550"
       layout="topleft"
       left="0"
       min_height="250"
@@ -532,13 +534,13 @@
                      top_pad="-21"
                      right="-10"
                      layout="topleft"
-                     follows="top|left"
+                     follows="top|left|right"
                      label="Hide In Search"
                      name="edit_private_btn"/>
           <button
             follows="top|left"
             height="23"
-            label="Cancel"
+            label="Back"
             layout="topleft"
             name="cancel_btn"
             width="120"