diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 822842c0a..229855df7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7493,22 +7493,6 @@ This should be as low as possible, but too low may break functionality
0
- FloaterFavoritesRect
-
- Comment
- Rectangle for favorites window
- Persist
- 1
- Type
- Rect
- Value
-
- 0
- 400
- 250
- 0
-
-
FloaterFindRect2
Comment
@@ -8174,22 +8158,6 @@ This should be as low as possible, but too low may break functionality
0
- FloaterMyOutfitsRect
-
- Comment
- Rectangle for My Outfits window
- Persist
- 1
- Type
- Rect
- Value
-
- 0
- 400
- 250
- 0
-
-
FloaterObjectIMInfo
Comment
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index d6e748d72..46862bfbd 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -101,6 +101,7 @@ F32 LLToolBar::sInventoryAutoOpenTime = 1.f;
// Functions
//
void show_floater(const std::string& floater_name);
+void show_inv_floater(const LLSD& userdata, const std::string& field);
LLToolBar::LLToolBar()
: LLLayoutPanel()
@@ -108,6 +109,9 @@ LLToolBar::LLToolBar()
setIsChrome(TRUE);
setFocusRoot(TRUE);
mCommitCallbackRegistrar.add("ShowFloater", boost::bind(show_floater, _2));
+ mCommitCallbackRegistrar.add("ShowInvFloater.ID", boost::bind(show_inv_floater, _2, "id"));
+ mCommitCallbackRegistrar.add("ShowInvFloater.Name", boost::bind(show_inv_floater, _2, "name"));
+ mCommitCallbackRegistrar.add("ShowInvFloater.Type", boost::bind(show_inv_floater, _2, "type"));
}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 81eacc728..e2b7e52cf 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -48,6 +48,7 @@
#include "statemachine/aifilepicker.h"
// newview includes
+#include "lffloaterinvpanel.h"
#include "lfsimfeaturehandler.h"
#include "llagent.h"
#include "llagentcamera.h"
@@ -8935,6 +8936,70 @@ class SinguUrlAction : public view_listener_t
}
};
+void show_inv_floater(const LLSD& userdata, const std::string& field)
+{
+ LFFloaterInvPanel::show(LLSD().with(field, userdata));
+}
+
+static void visible_inv_floater(const LLSD& userdata, const std::string& field)
+{
+ gMenuHolder->findControl(userdata["control"].asString())->setValue(!!LFFloaterInvPanel::getInstance(LLSD().with(field, userdata["data"])));
+}
+
+class ShowInvFloaterID : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ show_inv_floater(userdata, "id");
+ return true;
+ }
+};
+
+class VisibleInvFloaterID : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ visible_inv_floater(userdata, "id");
+ return true;
+ }
+};
+
+class ShowInvFloaterName : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ show_inv_floater(userdata, "name");
+ return true;
+ }
+};
+
+class VisibleInvFloaterName : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ visible_inv_floater(userdata, "name");
+ return true;
+ }
+};
+
+class ShowInvFloaterType : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ show_inv_floater(userdata, "type");
+ return true;
+ }
+};
+
+class VisibleInvFloaterType : public view_listener_t
+{
+ bool handleEvent(LLPointer event, const LLSD& userdata)
+ {
+ visible_inv_floater(userdata, "type");
+ return true;
+ }
+};
+
class VisibleSecondLife : public view_listener_t
{
bool handleEvent(LLPointer event, const LLSD& userdata)
@@ -9667,6 +9732,13 @@ void initialize_menus()
addMenu(new SinguUrlAction(), "URLAction");
addMenu(new LLSyncAnimations(), "Tools.ResyncAnimations");
+ addMenu(new ShowInvFloaterID, "ShowInvFloater.ID");
+ addMenu(new ShowInvFloaterName, "ShowInvFloater.Name");
+ addMenu(new ShowInvFloaterType, "ShowInvFloater.Type");
+ addMenu(new VisibleInvFloaterID, "InvFloaterVisible.ID");
+ addMenu(new VisibleInvFloaterName, "InvFloaterVisible.Name");
+ addMenu(new VisibleInvFloaterType, "InvFloaterVisible.Type");
+
// [RLVa:KB] - Checked: 2010-01-18 (RLVa-1.1.0m) | Added: RLVa-1.1.0m | OK
if (rlv_handler_t::isEnabled())
{
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_favs.xml b/indra/newview/skins/default/xui/de/floater_inventory_favs.xml
deleted file mode 100644
index b34911dd4..000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory_favs.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
-
diff --git a/indra/newview/skins/default/xui/en-us/floater_my_outfits.xml b/indra/newview/skins/default/xui/en-us/floater_my_outfits.xml
deleted file mode 100644
index fc0751ff2..000000000
--- a/indra/newview/skins/default/xui/en-us/floater_my_outfits.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 1e9ad54d2..138d195f3 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -618,10 +618,12 @@
-
-
-
-
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_favs.xml b/indra/newview/skins/default/xui/es/floater_inventory_favs.xml
deleted file mode 100644
index 49ec800f0..000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory_favs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
diff --git a/indra/newview/skins/default/xui/es/floater_my_outfits.xml b/indra/newview/skins/default/xui/es/floater_my_outfits.xml
deleted file mode 100644
index 9f7195449..000000000
--- a/indra/newview/skins/default/xui/es/floater_my_outfits.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-