summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-05-17 15:02:34 +0100
committerLynx Linden <lynx@lindenlab.com>2010-05-17 15:02:34 +0100
commit4b8182ae525785b6c15a58520f141a6b8b0e4fa2 (patch)
treec79923133b3c032dbc471819393d0b3650e7e379 /indra
parent09a1cb549d2128e5057d432a283f50679258e916 (diff)
EXT-6964 FIXED Added back the secondlife:///app/appearance SLapp handler.
This was removed inadvertantly in change 1fc92fc19c98.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappearancemgr.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index bcaba34921..be840cc348 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -55,6 +55,25 @@
char ORDER_NUMBER_SEPARATOR('@');
+// support for secondlife:///app/appearance SLapps
+class LLAppearanceHandler : public LLCommandHandler
+{
+public:
+ // requests will be throttled from a non-trusted browser
+ LLAppearanceHandler() : LLCommandHandler("appearance", UNTRUSTED_THROTTLE) {}
+
+ bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)
+ {
+ // support secondlife:///app/appearance/show, but for now we just
+ // make all secondlife:///app/appearance SLapps behave this way
+ LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD());
+ return true;
+ }
+};
+
+LLAppearanceHandler gAppearanceHandler;
+
+
LLUUID findDescendentCategoryIDByName(const LLUUID& parent_id, const std::string& name)
{
LLInventoryModel::cat_array_t cat_array;