MAINT-8016 Crash in LLFloaterAvatarRenderSettings::removePicker()

3 files changed, 0 insertions, 17 deletions

diff --git a/indra/newview/llfloateravatarrendersettings.cpp b/indra/newview/llfloateravatarrendersettings.cpp
index 8bdb70a20d..b8f854feb3 100644
--- a/indra/newview/llfloateravatarrendersettings.cpp
+++ b/indra/newview/llfloateravatarrendersettings.cpp
@@ -89,20 +89,11 @@ BOOL LLFloaterAvatarRenderSettings::postBuild()
     LLFloater::postBuild();
     mAvatarSettingsList = getChild<LLNameListCtrl>("render_settings_list");
     mAvatarSettingsList->setRightMouseDownCallback(boost::bind(&LLFloaterAvatarRenderSettings::onAvatarListRightClick, this, _1, _2, _3));
-    this->setVisibleCallback(boost::bind(&LLFloaterAvatarRenderSettings::removePicker, this));
     getChild<LLFilterEditor>("people_filter_input")->setCommitCallback(boost::bind(&LLFloaterAvatarRenderSettings::onFilterEdit, this, _2));
 
 	return TRUE;
 }
 
-void LLFloaterAvatarRenderSettings::removePicker()
-{
-    if(mPicker.get())
-    {
-        mPicker.get()->closeFloater();
-    }
-}
-
 void LLFloaterAvatarRenderSettings::draw()
 {
     if(mNeedsUpdate)
@@ -263,8 +254,6 @@ void LLFloaterAvatarRenderSettings::onClickAdd(const LLSD& userdata)
     {
         root_floater->addDependentFloater(picker);
     }
-
-    mPicker = picker->getHandle();
 }
 
 void LLFloaterAvatarRenderSettings::callbackAvatarPicked(const uuid_vec_t& ids, S32 visual_setting)
diff --git a/indra/newview/llfloateravatarrendersettings.h b/indra/newview/llfloateravatarrendersettings.h
index 6790b24b90..00ee074f17 100644
--- a/indra/newview/llfloateravatarrendersettings.h
+++ b/indra/newview/llfloateravatarrendersettings.h
@@ -66,7 +66,6 @@ private:
     bool mNeedsUpdate;
     LLListContextMenu* mContextMenu;
     LLNameListCtrl* mAvatarSettingsList;
-    LLHandle<LLFloater> mPicker;
 
     std::string mNameFilter;
 };
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index dddb258ed9..af6d11f47e 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -47,7 +47,6 @@
      top="20"
      width="500">
         <panel
-         border="none"
          height="150"
          label="Search"
          layout="topleft"
@@ -108,7 +107,6 @@
           </scroll_list>
         </panel>
         <panel
-         border="none"
          height="150"
          label="Friends"
          layout="topleft"
@@ -144,7 +142,6 @@
             <scroll_list
              follows="all"
              height="120"
-             border="false"
              layout="topleft"
              left="0"
              name="Friends"
@@ -154,7 +151,6 @@
         </panel>
 
         <panel
-         border="none"
          height="150"
          label="Near Me"
          layout="topleft"
@@ -213,7 +209,6 @@
              draw_heading="true"
              follows="all"
              height="100"
-             border="false"
              layout="topleft"
              left="0"
              name="NearMe"