diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
| commit | 77c39cef5292ca9fcd13aafeb074ef2b715baed8 (patch) | |
| tree | 90e19b4b9c73d9f9721bc628f50cf5de6829a0ba /indra/newview/llappearancemgr.cpp | |
| parent | 0994f9485534c35ca92b4ce1421544b7de8feea2 (diff) | |
| parent | f7bd5b98949fc72ac1fd4b97ecd4907e14c04315 (diff) | |
merged .hgtags from viewer-pre-beta
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; } |