diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-04-19 11:16:37 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-04-19 11:16:37 -0700 |
| commit | fbf886b7cc379bb4b9e409923b658af0b5c8fdef (patch) | |
| tree | 9e9220e8f28b1324453b1ff3fa19ec8fd6d1f918 /indra/newview/llappearancemgr.cpp | |
| parent | 64d20b8b745c184464c2a2f0795aeff0124ea3c5 (diff) | |
| parent | 99acd15974e34af82bec891a5d67b2d891ab82ea (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 1cf552e42c..f9e850899a 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -110,6 +110,12 @@ public: { // support secondlife:///app/appearance/show, but for now we just // make all secondlife:///app/appearance SLapps behave this way + if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAppearance")) + { + LLNotificationsUtil::add("NoAppearance", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit")); + return true; + } + LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD()); return true; } |