diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d2246359d7..ab9aae0fe8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -995,7 +995,7 @@ 1 - SkinCurrentTheme + SkinCurrentTheme2 Comment The selected theme for the current skin. @@ -12332,7 +12332,7 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - SkinCurrent + SkinCurrent2 Comment The currently selected skin. diff --git a/indra/newview/app_settings/settings_firestorm.xml b/indra/newview/app_settings/settings_firestorm.xml index 957ae553e8..eec7ca97bf 100644 --- a/indra/newview/app_settings/settings_firestorm.xml +++ b/indra/newview/app_settings/settings_firestorm.xml @@ -71,7 +71,7 @@ 0 - SkinCurrent + SkinCurrent2 Comment The currently selected skin. @@ -83,7 +83,7 @@ firestorm - SkinCurrentTheme + SkinCurrentTheme2 Comment The selected theme for the current skin. diff --git a/indra/newview/app_settings/settings_hybrid.xml b/indra/newview/app_settings/settings_hybrid.xml index e77fe110e0..a33d6d5cfa 100644 --- a/indra/newview/app_settings/settings_hybrid.xml +++ b/indra/newview/app_settings/settings_hybrid.xml @@ -59,7 +59,7 @@ 0 - SkinCurrent + SkinCurrent2 Comment The currently selected skin. @@ -71,7 +71,7 @@ metaharper - SkinCurrentTheme + SkinCurrentTheme2 Comment The selected theme for the current skin. diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml index c564890c8a..50c8005c4d 100644 --- a/indra/newview/app_settings/settings_phoenix.xml +++ b/indra/newview/app_settings/settings_phoenix.xml @@ -59,7 +59,7 @@ 0 - SkinCurrent + SkinCurrent2 Comment The currently selected skin. @@ -71,7 +71,7 @@ vintage - SkinCurrentTheme + SkinCurrentTheme2 Comment The selected theme for the current skin. diff --git a/indra/newview/app_settings/settings_v3.xml b/indra/newview/app_settings/settings_v3.xml index cc006b18e5..f8ac940624 100644 --- a/indra/newview/app_settings/settings_v3.xml +++ b/indra/newview/app_settings/settings_v3.xml @@ -71,7 +71,7 @@ 1 - SkinCurrent + SkinCurrent2 Comment The currently selected skin. @@ -80,10 +80,10 @@ Type String Value - starlight + metaharper - SkinCurrentTheme + SkinCurrentTheme2 Comment The selected theme for the current skin. @@ -92,7 +92,7 @@ Type String Value - original_orange + modern LetterKeysFocusChatBar diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d81c19c2d7..148809f3fd 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1894,8 +1894,8 @@ bool LLAppViewer::cleanup() LLUIColorTable::instance().saveUserSettings(); // - std::string skinSaved = gSavedSettings.getString("SkinCurrent"); - std::string themeSaved = gSavedSettings.getString("SkinCurrentTheme"); + std::string skinSaved = gSavedSettings.getString("SkinCurrent2"); + std::string themeSaved = gSavedSettings.getString("SkinCurrentTheme2"); if ((skinSaved != mCurrentSkin) || (themeSaved != mCurrentSkinTheme)) { llinfos << "Clearing skin colors." << llendflush; @@ -2726,10 +2726,10 @@ bool LLAppViewer::initConfiguration() } //-TT Hacking to save the skin and theme for future use. - mCurrentSkin = gSavedSettings.getString("SkinCurrent"); - mCurrentSkinTheme = gSavedSettings.getString("SkinCurrentTheme"); + mCurrentSkin = gSavedSettings.getString("SkinCurrent2"); + mCurrentSkinTheme = gSavedSettings.getString("SkinCurrentTheme2"); //-TT - const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent"); + const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent2"); if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString()) { // hack to force the skin to default. @@ -2738,7 +2738,7 @@ bool LLAppViewer::initConfiguration() // KB: catznip viewer-skins //gDirUtilp->setSkinFolder("default"); gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); - const LLControlVariable* themefolder = gSavedSettings.getControl("SkinCurrentTheme"); + const LLControlVariable* themefolder = gSavedSettings.getControl("SkinCurrentTheme2"); if ( (themefolder) && (LLStringUtil::null != skinfolder->getValue().asString()) ) gDirUtilp->setSkinThemeFolder(themefolder->getValue().asString()); } diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index de2bf23807..056e256b32 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -243,8 +243,8 @@ LLSD LLFloaterAbout::getInfo() info["BUILD_DATE"] = __DATE__; info["BUILD_TIME"] = __TIME__; info["CHANNEL"] = LLVersionInfo::getChannel(); - info["SKIN"] = gSavedSettings.getString("SkinCurrent"); - info["THEME"] = gSavedSettings.getString("SkinCurrentTheme"); + info["SKIN"] = gSavedSettings.getString("SkinCurrent2"); + info["THEME"] = gSavedSettings.getString("SkinCurrentTheme2"); //[FIRE 3113 : SJ] Added Font and fontsize to info info["FONT"] = "Unknown Font"; diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index e25b82c736..56a122214b 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -397,7 +397,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mCommitCallbackRegistrar.add("Pref.ClearSettings", boost::bind(&LLFloaterPreference::onClickClearSettings, this)); mCommitCallbackRegistrar.add("Pref.Online_Notices", boost::bind(&LLFloaterPreference::onClickChatOnlineNotices, this)); - sSkin = gSavedSettings.getString("SkinCurrent"); + sSkin = gSavedSettings.getString("SkinCurrent2"); mCommitCallbackRegistrar.add("Pref.ClickActionChange", boost::bind(&LLFloaterPreference::onClickActionChange, this)); @@ -610,7 +610,7 @@ void LLFloaterPreference::apply() LLTabContainer* tabcontainer = getChild("pref core"); /* - if (sSkin != gSavedSettings.getString("SkinCurrent")) + if (sSkin != gSavedSettings.getString("SkinCurrent2")) { LLNotificationsUtil::add("ChangeSkin"); refreshSkin(this); @@ -716,7 +716,7 @@ void LLFloaterPreference::cancel() } // reverts any changes to current skin - //gSavedSettings.setString("SkinCurrent", sSkin); + //gSavedSettings.setString("SkinCurrent2", sSkin); if (mClickActionDirty) { @@ -1106,20 +1106,20 @@ void LLFloaterPreference::onClickJavascript() /* void LLFloaterPreference::onClickSkin(LLUICtrl* ctrl, const LLSD& userdata) { - gSavedSettings.setString("SkinCurrent", userdata.asString()); + gSavedSettings.setString("SkinCurrent2", userdata.asString()); ctrl->setValue(userdata.asString()); } void LLFloaterPreference::onSelectSkin() { std::string skin_selection = getChild("skin_selection")->getValue().asString(); - gSavedSettings.setString("SkinCurrent", skin_selection); + gSavedSettings.setString("SkinCurrent2", skin_selection); } void LLFloaterPreference::refreshSkin(void* data) { LLPanel*self = (LLPanel*)data; - sSkin = gSavedSettings.getString("SkinCurrent"); + sSkin = gSavedSettings.getString("SkinCurrent2"); self->getChild("skin_selection", true)->setValue(sSkin); } */ @@ -1919,7 +1919,7 @@ BOOL LLPanelPreference::postBuild() // if skin is set to a skin that no longer exists (silver) set back to default if (getChild("skin_selection")->getSelectedIndex() < 0) { - gSavedSettings.setString("SkinCurrent", "default"); + gSavedSettings.setString("SkinCurrent2", "default"); LLFloaterPreference::refreshSkin(this); } @@ -2471,8 +2471,8 @@ static LLRegisterPanelClassWrapper t_pref_skins("panel_p LLPanelPreferenceSkins::LLPanelPreferenceSkins() : LLPanelPreference(), m_pSkinCombo(NULL), m_pSkinThemeCombo(NULL) { - m_Skin = gSavedSettings.getString("SkinCurrent"); - m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme"); + m_Skin = gSavedSettings.getString("SkinCurrent2"); + m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme2"); const std::string strSkinsPath = gDirUtilp->getSkinBaseDir() + gDirUtilp->getDirDelimiter() + "skins.xml"; llifstream fileSkins(strSkinsPath, std::ios::binary); if (fileSkins.is_open()) @@ -2500,10 +2500,10 @@ BOOL LLPanelPreferenceSkins::postBuild() void LLPanelPreferenceSkins::apply() { - if ( (m_Skin != gSavedSettings.getString("SkinCurrent")) || (m_SkinTheme != gSavedSettings.getString("SkinCurrentTheme")) ) + if ( (m_Skin != gSavedSettings.getString("SkinCurrent2")) || (m_SkinTheme != gSavedSettings.getString("SkinCurrentTheme2")) ) { - gSavedSettings.setString("SkinCurrent", m_Skin); - gSavedSettings.setString("SkinCurrentTheme", m_SkinTheme); + gSavedSettings.setString("SkinCurrent2", m_Skin); + gSavedSettings.setString("SkinCurrentTheme2", m_SkinTheme); LLNotificationsUtil::add("ChangeSkin"); @@ -2513,8 +2513,8 @@ void LLPanelPreferenceSkins::apply() void LLPanelPreferenceSkins::cancel() { - m_Skin = gSavedSettings.getString("SkinCurrent"); - m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme"); + m_Skin = gSavedSettings.getString("SkinCurrent2"); + m_SkinTheme = gSavedSettings.getString("SkinCurrentTheme2"); refreshSkinList(); } @@ -2526,16 +2526,16 @@ void LLPanelPreferenceSkins::onSkinChanged() onSkinThemeChanged(); // make sure we initialize a theme for our new skin //AO: Some crude hardcoded preferences per skin. We will remove these and replace them with "basic mode"-style behaviors in the 2.6 mergeup - if (m_Skin.compare("starlight") == 0) - { - gSavedSettings.setBOOL("ShowMenuBarLocation", FALSE); - gSavedSettings.setBOOL("ShowNavbarNavigationPanel",TRUE); - } - else - { - gSavedSettings.setBOOL("ShowMenuBarLocation", TRUE); - gSavedSettings.setBOOL("ShowNavbarNavigationPanel",FALSE); - } + //if (m_Skin.compare("starlight") == 0) + //{ + // gSavedSettings.setBOOL("ShowMenuBarLocation", FALSE); + // gSavedSettings.setBOOL("ShowNavbarNavigationPanel",TRUE); + //} + //else + //{ + // gSavedSettings.setBOOL("ShowMenuBarLocation", TRUE); + // gSavedSettings.setBOOL("ShowNavbarNavigationPanel",FALSE); + //} } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f39ea58334..50bfc714cb 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -542,7 +542,7 @@ std::string LLViewerMedia::getCurrentUserAgent() { // Don't use user-visible string to avoid // punctuation and strange characters. - std::string skin_name = gSavedSettings.getString("SkinCurrent"); + std::string skin_name = gSavedSettings.getString("SkinCurrent2"); // Just in case we need to check browser differences in A/B test // builds. diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 15dcda59cf..4179b22a00 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -299,7 +299,7 @@ public: // switch skins without restarting the app. static void updateBrowserUserAgent(); - // Callback for when the SkinCurrent control is changed to + // Callback for when the SkinCurrent2 control is changed to // switch the user agent string to indicate the new skin. static bool handleSkinCurrentChanged(const LLSD& newvalue); diff --git a/indra/newview/skins/skins.xml b/indra/newview/skins/skins.xml index 293043ef7e..4062c47038 100644 --- a/indra/newview/skins/skins.xml +++ b/indra/newview/skins/skins.xml @@ -73,7 +73,7 @@ - +