SL-11594 FIXED [Viewer Profile Project] 'OK' button does not save changes at 'Profile' - 'Classifieds' tab

4 files changed, 20 insertions, 3 deletions

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 2c07ff576d..1b3462176e 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1591,6 +1591,7 @@ void LLPanelProfile::apply()
         mPanelInterests->apply();
         mPanelPicks->apply();
         mPanelNotes->apply();
+        mPanelClassifieds->apply();
 
         //KC - Classifieds handles this itself
     }
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index 3a5347018d..225aca406e 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -356,7 +356,20 @@ bool LLPanelProfileClassifieds::canDeleteClassified()
     return (mTabContainer->getTabCount() > 0);
 }
 
-
+void LLPanelProfileClassifieds::apply()
+{
+    if (getIsLoaded())
+    {
+        for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
+        {
+            LLPanelProfileClassified* classified_panel = dynamic_cast<LLPanelProfileClassified*>(mTabContainer->getPanelByIndex(tab_idx));
+            if (classified_panel && classified_panel->isDirty())
+            {
+                classified_panel->doSave();
+            }
+        }
+    }
+}
 //-----------------------------------------------------------------------------
 // LLDispatchClassifiedClickThrough
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/llpanelprofileclassifieds.h b/indra/newview/llpanelprofileclassifieds.h
index 9bf9ff4a6b..53ee41cf04 100644
--- a/indra/newview/llpanelprofileclassifieds.h
+++ b/indra/newview/llpanelprofileclassifieds.h
@@ -88,6 +88,8 @@ public:
 
     /*virtual*/ void updateData();
 
+    /*virtual*/ void apply();
+
 private:
     void onClickNewBtn();
     void onClickDelete();
@@ -203,6 +205,8 @@ public:
             const LLVector3d& global_pos,
             const std::string& sim_name);
 
+    void doSave();
+
 protected:
 
     /*virtual*/ void resetData();
@@ -248,8 +252,6 @@ protected:
     void onSetLocationClick();
     void onChange();
 
-    void doSave();
-
     void onPublishFloaterPublishClicked();
 
     void onTexturePickerMouseEnter();
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 6a0489ae97..7f0f86d524 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -464,6 +464,7 @@
                  font="SansSerif"
                  max_length_bytes="30"
                  prevalidate_callback="ascii"
+                 commit_on_focus_lost="false"
                  text_color="black"
                 />
                 <text