diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
| commit | 39ad3f1d880a26dcf8189cad2501002c189a7ac2 (patch) | |
| tree | a843d0c5843ca5e6a5fcbdfc6929bc2b21b960d6 /indra/newview/llappearancemgr.cpp | |
| parent | 5c7a906b44aa950ec3c8b786fec6516b51f9d66c (diff) | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (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; } |