diff options
75 files changed, 19 insertions, 10284 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e930b2ac71..367d3de0c9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -180,13 +180,11 @@ set(viewer_SOURCE_FILES llfloaterbuyland.cpp llfloatercamera.cpp llfloatercolorpicker.cpp - llfloaterdaycycle.cpp llfloaterdeleteenvpreset.cpp llfloaterdisplayname.cpp llfloatereditdaycycle.cpp llfloatereditsky.cpp llfloatereditwater.cpp - llfloaterenvsettings.cpp llfloaterenvironmentsettings.cpp llfloaterevent.cpp llfloaterfonttest.cpp @@ -240,10 +238,8 @@ set(viewer_SOURCE_FILES llfloateruipreview.cpp llfloaterurlentry.cpp llfloatervoiceeffect.cpp - llfloaterwater.cpp llfloaterwebcontent.cpp llfloaterwhitelistentry.cpp - llfloaterwindlight.cpp llfloaterwindowsize.cpp llfloaterworldmap.cpp llfolderview.cpp @@ -740,13 +736,11 @@ set(viewer_HEADER_FILES llfloaterbuyland.h llfloatercamera.h llfloatercolorpicker.h - llfloaterdaycycle.h llfloaterdeleteenvpreset.h llfloaterdisplayname.h llfloatereditdaycycle.h llfloatereditsky.h llfloatereditwater.h - llfloaterenvsettings.h llfloaterenvironmentsettings.h llfloaterevent.h llfloaterfonttest.h @@ -800,10 +794,8 @@ set(viewer_HEADER_FILES llfloateruipreview.h llfloaterurlentry.h llfloatervoiceeffect.h - llfloaterwater.h llfloaterwebcontent.h llfloaterwhitelistentry.h - llfloaterwindlight.h llfloaterwindowsize.h llfloaterworldmap.h llfolderview.h diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index efe605e5e6..01daf1ceb2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10237,17 +10237,6 @@ <key>Value</key> <real>0.300000011921</real> </map> - <key>SkyEditPresets</key> - <map> - <key>Comment</key> - <string>Whether to be able to edit the sky defaults or not</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>SkyNightColorShift</key> <map> <key>Comment</key> @@ -12543,17 +12532,6 @@ <key>Value</key> <integer>20</integer> </map> - <key>WaterEditPresets</key> - <map> - <key>Comment</key> - <string>Whether to be able to edit the water defaults or not</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>WaterGLFogDensityScale</key> <map> <key>Comment</key> diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 4051a4d8db..c2720eaf28 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -35,536 +35,12 @@ #include "llenvmanager.h" #include "llagent.h" -#include "llviewerregion.h" - #include "lldaycyclemanager.h" -#include "llfloaterreg.h" -#include "llfloaterwindlight.h" -#include "llfloaterwater.h" -#include "llfloaterenvsettings.h" -#include "llwlparammanager.h" +#include "llviewercontrol.h" // for gSavedSettings +#include "llviewerregion.h" #include "llwaterparammanager.h" -#include "llfloaterregioninfo.h" -//#include "llwindlightscrubbers.h" // *HACK commented out since this code isn't released (yet) #include "llwlhandlers.h" -#include "llnotifications.h" - -extern LLControlGroup gSavedSettings; - -/*virtual*/ void LLEnvManager::initSingleton() -{ - LL_DEBUGS("Windlight") << "Initializing LLEnvManager" << LL_ENDL; - - mOrigSettingStore[LLEnvKey::SCOPE_LOCAL] = lindenDefaults(); - mCurNormalScope = (gSavedSettings.getBOOL("UseEnvironmentFromRegion") ? LLEnvKey::SCOPE_REGION : LLEnvKey::SCOPE_LOCAL); - mInterpNextChangeMessage = true; - mPendingOutgoingMessage = false; - mIsEditing = false; -} - -/******* - * Region Changes - *******/ - -void LLEnvManager::notifyLogin() -{ - changedRegion(false); -} -void LLEnvManager::notifyCrossing() -{ - changedRegion(true); -} -void LLEnvManager::notifyTP() -{ - changedRegion(false); -} -void LLEnvManager::changedRegion(bool interp) -{ - mInterpNextChangeMessage = interp; - mPendingOutgoingMessage = false; - - LLFloaterReg::hideInstance("old_env_settings"); - LLFloaterReg::hideInstance("env_settings"); - - resetInternalsToDefault(LLEnvKey::SCOPE_REGION); - - maybeClearEditingScope(LLEnvKey::SCOPE_REGION, true, false); -} - -/******* - * Editing settings / UI mode - *******/ - -void LLEnvManager::startEditingScope(LLEnvKey::EScope scope) -{ - LL_DEBUGS("Windlight") << "Starting editing scope " << scope << LL_ENDL; - - if (mIsEditing) - { - LL_WARNS("Windlight") << "Tried to start editing windlight settings while already editing some settings (possibly others)! Ignoring..." << LL_ENDL; - return; - } - if (!canEdit(scope)) - { - LL_WARNS("Windlight") << "Tried to start editing windlight settings while not allowed to! Ignoring..." << LL_ENDL; - return; - } - - mIsEditing = true; - mCurEditingScope = scope; - - // Back up local settings so that we can switch back to them later. - if (scope != LLEnvKey::SCOPE_LOCAL) - { - backUpLocalSettingsIfNeeded(); - } - - // show scope being edited - loadSettingsIntoManagers(scope, false); - - switch (scope) - { - case LLEnvKey::SCOPE_LOCAL: - // not implemented here (yet) - return; - case LLEnvKey::SCOPE_REGION: - /* LLPanelRegionTerrainInfo::instance()->setCommitControls(true); the windlight settings are no longer on the region terrain panel */ - break; - default: - return; - } -} - -void LLEnvManager::maybeClearEditingScope(LLEnvKey::EScope scope, bool user_initiated, bool was_commit) -{ - if (mIsEditing && mCurEditingScope == scope) - { - maybeClearEditingScope(user_initiated, was_commit); // handles UI, updating managers, etc. - } -} - -void LLEnvManager::maybeClearEditingScope(bool user_initiated, bool was_commit) -{ - bool clear_now = true; - if (mIsEditing && !was_commit) - { - if(user_initiated) - { - LLSD args; - args["SCOPE"] = getScopeString(mCurEditingScope); - LLNotifications::instance().add("EnvEditUnsavedChangesCancel", args, LLSD(), - boost::bind(&LLEnvManager::clearEditingScope, this, _1, _2)); - clear_now = false; - } - else - { - LLNotifications::instance().add("EnvEditExternalCancel", LLSD(), LLSD()); - } - } - - if(clear_now) - { - clearEditingScope(LLSD(), LLSD()); - } -} - -void LLEnvManager::clearEditingScope(const LLSD& notification, const LLSD& response) -{ - if(notification.isDefined() && response.isDefined() && LLNotification::getSelectedOption(notification, response) != 0) - { -#if 0 - // *TODO: select terrain panel here - mIsEditing = false; - LLFloaterReg::showTypedInstance<LLFloaterRegionInfo>("regioninfo"); -#endif - return; - } - - mIsEditing = false; - - updateUIFromEditability(); - /* LLPanelRegionTerrainInfo::instance()->cancelChanges(); the terrain panel no longer has windlight data - if this is needed, it should move. */ - - loadSettingsIntoManagers(mCurNormalScope, true); -} - -void LLEnvManager::updateUIFromEditability() -{ - // *TODO When the checkbox from LLFloaterEnvSettings is moved elsewhere, opening the local environment settings window should auto-display local settings - // Currently, disable all editing to ensure region settings are hidden from those that can't edit them (to preserve possibility of future tradable assets) - // Remove "!gSavedSettings.getBOOL(...)" when the desired behavior is implemented -// LLFloaterEnvSettings::instance()->setControlsEnabled(canEdit(LLEnvKey::SCOPE_LOCAL) && !gSavedSettings.getBOOL("UseEnvironmentFromRegion")); -// LLPanelRegionTerrainInfo::instance()->setEnvControls(canEdit(LLEnvKey::SCOPE_REGION)); - // enable estate UI iff canEdit(LLEnvKey::SCOPE_ESTATE), etc. -} - -bool LLEnvManager::regionCapable() -{ - return !gAgent.getRegion()->getCapability("EnvironmentSettings").empty(); -} - -const std::string LLEnvManager::getScopeString(LLEnvKey::EScope scope) -{ - switch(scope) - { - case LLEnvKey::SCOPE_LOCAL: - return LLTrans::getString("LocalSettings"); - case LLEnvKey::SCOPE_REGION: - return LLTrans::getString("RegionSettings"); - default: - return " (?)"; - } -} - -bool LLEnvManager::canEdit(LLEnvKey::EScope scope) -{ - // can't edit while a message is being sent or if already editing - if (mPendingOutgoingMessage || mIsEditing) - { - return false; - } - - // check permissions and caps - switch (scope) - { - case LLEnvKey::SCOPE_LOCAL: - return true; // always permitted to edit local - case LLEnvKey::SCOPE_REGION: - bool owner_or_god_or_manager; - { - LLViewerRegion* region = gAgent.getRegion(); - if (NULL == region || region->getCapability("EnvironmentSettings").empty()) - { - // not a windlight-aware region - return false; - } - owner_or_god_or_manager = gAgent.isGodlike() - || (region && (region->getOwner() == gAgent.getID())) - || (region && region->isEstateManager()); - } - return owner_or_god_or_manager; - default: - return false; - } -} - -/******* - * Incoming Messaging - *******/ - -void LLEnvManager::refreshFromStorage(LLEnvKey::EScope scope) -{ - // Back up local env. settings so that we can switch to them later. - if (scope != LLEnvKey::SCOPE_LOCAL) - { - backUpLocalSettingsIfNeeded(); - } - - switch (scope) - { - case LLEnvKey::SCOPE_LOCAL: - break; - case LLEnvKey::SCOPE_REGION: - if (!LLEnvironmentRequest::initiate()) - { - // don't have a cap for this, presume invalid response - processIncomingMessage(LLSD(), scope); - } - break; - default: - processIncomingMessage(LLSD(), scope); - break; - } -} - -bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const LLEnvKey::EScope scope) -{ - if (scope != LLEnvKey::SCOPE_REGION) - { - return false; - } - - // Start out with defaults - resetInternalsToDefault(scope); - updateUIFromEditability(); - - // Validate - //std::set<std::string> empty_set; - //LLWLPacketScrubber scrubber(scope, empty_set); - //LLSD windlight_llsd = scrubber.scrub(unvalidated_content); - - //bool valid = windlight_llsd.isDefined(); // successful scrub - - // *HACK - Don't have the validator, so just use content without validating. Should validate here for third-party grids. - LLSD windlight_llsd(unvalidated_content); - bool valid = true; - // end HACK - - mLastReceivedID = unvalidated_content[0]["messageID"].asUUID(); // if the message was valid, grab the UUID from it and save it for next outbound update message - LL_DEBUGS("Windlight Sync") << "mLastReceivedID: " << mLastReceivedID << LL_ENDL; - LL_DEBUGS("Windlight Sync") << "windlight_llsd: " << windlight_llsd << LL_ENDL; - - if (valid) - { - // TODO - the sun controls are moving; this should be updated - F32 sun_hour = 0; - LLPanelRegionTerrainInfo* terrain_panel = LLPanelRegionTerrainInfo::instance(); - - if (terrain_panel) - { - sun_hour = terrain_panel->getSunHour(); // this slider is kept up to date - } - else - { - llwarns << "Cannot instantiate the terrain panel (exiting?)" << llendl; - } - - LLWLParamManager::getInstance()->addAllSkies(scope, windlight_llsd[2]); - LLEnvironmentSettings newSettings(windlight_llsd[1], windlight_llsd[2], windlight_llsd[3], sun_hour); - mOrigSettingStore[scope] = newSettings; - } - else - { - LL_WARNS("Windlight Sync") << "Failed to parse windlight settings!" << LL_ENDL; - // presume defaults (already reset above) - } - - maybeClearEditingScope(scope, false, false); - - // refresh display with new settings, if applicable - if (mCurNormalScope == scope && !mIsEditing) // if mIsEditing still, must be editing some other scope, so don't load - { - loadSettingsIntoManagers(scope, mInterpNextChangeMessage); - } - else - { - LL_DEBUGS("Windlight Sync") << "Not loading settings (mCurNormalScope=" << mCurNormalScope << ", scope=" << scope << ", mIsEditing=" << mIsEditing << ")" << LL_ENDL; - } - - mInterpNextChangeMessage = true; // reset flag - - return valid; -} - - -/******* - * Outgoing Messaging - *******/ - -void LLEnvManager::commitSettings(LLEnvKey::EScope scope) -{ - LL_DEBUGS("Windlight Sync") << "commitSettings(scope = " << scope << ")" << LL_ENDL; - - bool success = true; - switch (scope) - { - case (LLEnvKey::SCOPE_LOCAL): - // not implemented - LLWLParamManager and LLWaterParamManager currently manage local storage themselves - break; - case (LLEnvKey::SCOPE_REGION): - mPendingOutgoingMessage = true; - LLSD metadata(LLSD::emptyMap()); - metadata["regionID"] = gAgent.getRegion()->getRegionID(); - metadata["messageID"] = mLastReceivedID; // add last received update ID to outbound message so simulator can handle concurrent updates - - saveSettingsFromManagers(scope); // save current settings into settings store before grabbing from settings store and sending - success = LLEnvironmentApply::initiateRequest(makePacket(LLEnvKey::SCOPE_REGION, metadata)); - if(success) - { - // while waiting for the return message, render old settings - // (as of Aug 09, we should get an updated RegionInfo packet, which triggers a re-request of Windlight data, which causes us to show new settings) - loadSettingsIntoManagers(LLEnvKey::SCOPE_REGION, true); - } - break; - } - - if(success) - { - // with mPendingOutgoingMessage = true, nothing is editable - updateUIFromEditability(); - maybeClearEditingScope(true, true); - } - else - { - mPendingOutgoingMessage = false; - } -} - -LLSD LLEnvManager::makePacket(LLEnvKey::EScope scope, const LLSD& metadata) -{ - return mOrigSettingStore[scope].makePacket(metadata); -} - -void LLEnvManager::commitSettingsFinished(LLEnvKey::EScope scope) -{ - mPendingOutgoingMessage = false; - - updateUIFromEditability(); -} - -void LLEnvManager::applyLocalSettingsToRegion() -{ - // Immediately apply current environment settings to region. - LLEnvManager::instance().commitSettings(LLEnvKey::SCOPE_REGION); -} - -/******* - * Loading defaults - *******/ - -void LLEnvManager::resetInternalsToDefault(LLEnvKey::EScope scope) -{ - if (LLEnvKey::SCOPE_LOCAL != scope) - { - LLWLParamManager::getInstance()->clearParamSetsOfScope(scope); - } - - mOrigSettingStore[scope] = lindenDefaults(); - LLWLParamManager::getInstance()->mAnimator.setTimeType(LLWLAnimator::TIME_LINDEN); -} - -const LLEnvironmentSettings& LLEnvManager::lindenDefaults() -{ - static bool loaded = false; - static LLEnvironmentSettings defSettings; - - if (!loaded) - { - LLWaterParamSet defaultWater; - LLWaterParamManager::instance().getParamSet("default", defaultWater); - - // *TODO save default skies (remove hack in LLWLDayCycle::loadDayCycle when this is done) - - defSettings.saveParams( - LLWLDayCycle::loadCycleDataFromFile("default.xml"), // frames will refer to local presets, which is okay - LLSD(LLSD::emptyMap()), // should never lose the default sky presets (read-only) - defaultWater.getAll(), - 0.0); - - loaded = true; - } - - return defSettings; -} - -/******* - * Manipulation of Param Managers - *******/ - -void LLEnvManager::loadSettingsIntoManagers(LLEnvKey::EScope scope, bool interpolate) -{ - LL_DEBUGS("Windlight Sync") << "Loading settings (scope = " << scope << ")" << LL_ENDL; - - LLEnvironmentSettings settings = mOrigSettingStore[scope]; - - if(interpolate) - { - LLWLParamManager::getInstance()->mAnimator.startInterpolation(settings.getWaterParams()); - } - - LLWLParamManager::getInstance()->addAllSkies(scope, settings.getSkyMap()); - LLWLParamManager::getInstance()->mDay.loadDayCycle(settings.getWLDayCycle(), scope); - LLWLParamManager::getInstance()->resetAnimator(settings.getDayTime(), true); - - LLWaterParamManager::getInstance()->mCurParams.setAll(settings.getWaterParams()); -} - -void LLEnvManager::saveSettingsFromManagers(LLEnvKey::EScope scope) -{ - LL_DEBUGS("Windlight Sync") << "Saving settings (scope = " << scope << ")" << LL_ENDL; - switch (scope) - { - case LLEnvKey::SCOPE_LOCAL: - mOrigSettingStore[scope].saveParams( - LLWLParamManager::getInstance()->mDay.asLLSD(), - LLSD(LLSD::emptyMap()), // never overwrite - LLWaterParamManager::getInstance()->mCurParams.getAll(), - LLWLParamManager::getInstance()->mAnimator.mDayTime); - break; - case LLEnvKey::SCOPE_REGION: - { - // ensure only referenced region-scope skies are saved, resolve naming collisions, etc. - std::map<LLWLParamKey, LLWLParamSet> final_references = LLWLParamManager::getInstance()->finalizeFromDayCycle(scope); - LLSD referenced_skies = LLWLParamManager::createSkyMap(final_references); - - LL_DEBUGS("Windlight Sync") << "Dumping referenced skies (" << final_references.size() << ") to LLSD: " << referenced_skies << LL_ENDL; - - mOrigSettingStore[scope].saveParams( - LLWLParamManager::getInstance()->mDay.asLLSD(), - referenced_skies, - LLWaterParamManager::getInstance()->mCurParams.getAll(), - LLWLParamManager::getInstance()->mAnimator.mDayTime); - } - break; - default: - return; - } -} - -void LLEnvManager::backUpLocalSettingsIfNeeded() -{ - // *HACK: Back up local env. settings so that we can switch to them later. - // Otherwise local day cycle is likely to be reset. - static bool sSavedLocalSettings = false; - - if (!sSavedLocalSettings) - { - LL_DEBUGS("Windlight") << "Backing up local environment settings" << LL_ENDL; - saveSettingsFromManagers(LLEnvKey::SCOPE_LOCAL); - sSavedLocalSettings = true; - } -} - -/******* - * Setting desired display level - *******/ - -void LLEnvManager::setNormallyDisplayedScope(LLEnvKey::EScope new_scope) -{ - // temp, just save the scope directly as a value in the future when there's more than two - bool want_region = (LLEnvKey::SCOPE_REGION == new_scope); - gSavedSettings.setBOOL("UseEnvironmentFromRegion", want_region); - - if (mCurNormalScope != new_scope) - { - LL_INFOS("Windlight") << "Switching to scope " << new_scope << LL_ENDL; - mCurNormalScope = new_scope; - notifyOptInChange(); - } -} - -LLEnvKey::EScope LLEnvManager::getNormallyDisplayedScope() const -{ - return mCurNormalScope; -} - -void LLEnvManager::notifyOptInChange() -{ - bool opt_in = gSavedSettings.getBOOL("UseEnvironmentFromRegion"); - - // Save local settings if switching to region - if(opt_in) - { - LL_INFOS("Windlight") << "Saving currently-displayed settings as current local settings..." << LL_ENDL; - saveSettingsFromManagers(LLEnvKey::SCOPE_LOCAL); - } - - maybeClearEditingScope(true, false); -} - -void LLEnvManager::dumpScopes() -{ - LLSD scope_dump; - - scope_dump = makePacket(LLEnvKey::SCOPE_LOCAL, LLSD()); - LL_DEBUGS("Windlight") << "Local scope:" << scope_dump << LL_ENDL; - - scope_dump = makePacket(LLEnvKey::SCOPE_REGION, LLSD()); - LL_DEBUGS("Windlight") << "Region scope:" << scope_dump << LL_ENDL; -} - - -//============================================================================= +#include "llwlparammanager.h" std::string LLEnvPrefs::getWaterPresetName() const { @@ -973,6 +449,20 @@ bool LLEnvManagerNew::canEditRegionSettings() return owner_or_god_or_manager; } +// static +const std::string LLEnvManagerNew::getScopeString(LLEnvKey::EScope scope) +{ + switch(scope) + { + case LLEnvKey::SCOPE_LOCAL: + return LLTrans::getString("LocalSettings"); + case LLEnvKey::SCOPE_REGION: + return LLTrans::getString("RegionSettings"); + default: + return " (?)"; + } +} + void LLEnvManagerNew::onRegionCrossing() { LL_DEBUGS("Windlight") << "Crossed region" << LL_ENDL; diff --git a/indra/newview/llenvmanager.h b/indra/newview/llenvmanager.h index 343416634c..96af102c1a 100644 --- a/indra/newview/llenvmanager.h +++ b/indra/newview/llenvmanager.h @@ -133,103 +133,6 @@ private: F64 mDayTime; }; -// not thread-safe -class LLEnvManager : public LLSingleton<LLEnvManager> -{ - LOG_CLASS(LLEnvManager); -public: - // sets scopes (currently, only region-scope) to startup states - // delay calling these until as close as possible to knowing whether the remote service is capable of holding windlight settings - void notifyCrossing(); - // these avoid interpolation on the next incoming message (if it comes) - void notifyLogin(); - void notifyTP(); - - // request settings again from remote storage (currently implemented only for region) - void refreshFromStorage(LLEnvKey::EScope scope); - // stores settings and starts transitions (as necessary) - // validates packet and returns whether it was valid - // loads defaults if not valid - // returns whether or not arguments were valid - bool processIncomingMessage(const LLSD& packet, LLEnvKey::EScope scope); - // saves settings in the given scope to persistent storage appropriate for that scope - void commitSettings(LLEnvKey::EScope scope); - // called back when the commit finishes - void commitSettingsFinished(LLEnvKey::EScope scope); - // Immediately apply current settings from managers to region. - void applyLocalSettingsToRegion(); - - /* - * notify of changes in god/not-god mode, estate ownership, etc. - * should be called every time after entering new region (after receiving new caps) - */ - void notifyPermissionChange(); - - bool regionCapable(); - static const std::string getScopeString(LLEnvKey::EScope scope); - bool canEdit(LLEnvKey::EScope scope); - // enables and populates UI - // populates display (param managers) with scope's settings - // silently fails if canEdit(scope) is false! - void startEditingScope(LLEnvKey::EScope scope); - // cancel and close UI as necessary - // reapplies unedited settings - // displays the settings from the scope that user has set (i.e. opt-in setting for now) - void maybeClearEditingScope(bool user_initiated, bool was_commit); - // clear the scope only if was editing that scope - void maybeClearEditingScope(LLEnvKey::EScope scope, bool user_initiated, bool was_commit); - // actually do the clearing - void clearEditingScope(const LLSD& notification, const LLSD& response); - - // clear and reload defaults into scope - void resetInternalsToDefault(LLEnvKey::EScope scope); - - // sets which scope is to be displayed - // fix me if/when adding more levels of scope - void setNormallyDisplayedScope(LLEnvKey::EScope scope); - // gets normally displayed scope - LLEnvKey::EScope getNormallyDisplayedScope() const; - - // for debugging purposes - void dumpScopes(); - -private: - // overriden initializer - friend class LLSingleton<LLEnvManager>; - virtual void initSingleton(); - // helper function (when region changes, but before caps are received) - void changedRegion(bool interpolate); - // apply to current display and UI - void loadSettingsIntoManagers(LLEnvKey::EScope scope, bool interpolate); - // save from current display and UI into memory (mOrigSettingStore) - void saveSettingsFromManagers(LLEnvKey::EScope scope); - // If not done already, save current local environment settings, so that we can switch to them later. - void backUpLocalSettingsIfNeeded(); - - // Save copy of settings from the current ones in the param managers - LLEnvironmentSettings collateFromParamManagers(); - // bundle settings (already committed from UI) into an LLSD - LLSD makePacket(LLEnvKey::EScope scope, const LLSD& metadata); - - void updateUIFromEditability(); - - // only call when setting *changes*, not just when it might have changed - // saves local settings into mOrigSettingStore when necessary - void notifyOptInChange(); - - // calculate Linden default settings - static const LLEnvironmentSettings& lindenDefaults(); - - std::map<LLEnvKey::EScope, LLEnvironmentSettings> mOrigSettingStore; // settings which have been committed from UI - - bool mInterpNextChangeMessage; - bool mPendingOutgoingMessage; - bool mIsEditing; - LLEnvKey::EScope mCurNormalScope; // scope being displayed when not editing (i.e. most of the time) - LLEnvKey::EScope mCurEditingScope; - LLUUID mLastReceivedID; -}; - /** * User environment preferences. */ @@ -329,6 +232,7 @@ public: boost::signals2::connection setRegionSettingsAppliedCallback(const region_settings_applied_signal_t::slot_type& cb); static bool canEditRegionSettings(); /// @return true if we have access to editing region environment + static const std::string getScopeString(LLEnvKey::EScope scope); // Public callbacks. void onRegionCrossing(); diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp deleted file mode 100644 index 9fcfc41f77..0000000000 --- a/indra/newview/llfloaterdaycycle.cpp +++ /dev/null @@ -1,525 +0,0 @@ -/** - * @file llfloaterdaycycle.cpp - * @brief LLFloaterDayCycle class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloaterdaycycle.h" - -#include "pipeline.h" -#include "llsky.h" - -#include "llsliderctrl.h" -#include "llmultislider.h" -#include "llmultisliderctrl.h" -#include "llspinctrl.h" -#include "llcheckboxctrl.h" -#include "lluictrlfactory.h" -#include "llviewercamera.h" -#include "llcombobox.h" -#include "lllineeditor.h" -#include "llwlanimator.h" -#include "llnotifications.h" -#include "llnotificationsutil.h" - -#include "v4math.h" -#include "llviewerdisplay.h" -#include "llviewercontrol.h" -#include "llviewerwindow.h" - -#include "llwlparamset.h" -#include "llwlparammanager.h" -#include "llpostprocess.h" -#include "llfloaterwindlight.h" -//#include "llwindlightscrubbers.h" // *HACK commented out since this code isn't released (yet) -#include "llenvmanager.h" -#include "llfloaterreg.h" - -LLFloaterDayCycle* LLFloaterDayCycle::sDayCycle = NULL; -const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f; -std::map<std::string, LLWLCycleSliderKey> LLFloaterDayCycle::sSliderToKey; -LLEnvKey::EScope LLFloaterDayCycle::sScope; -std::string LLFloaterDayCycle::sOriginalTitle; -LLWLAnimator::ETime LLFloaterDayCycle::sPreviousTimeType = LLWLAnimator::TIME_LINDEN; - -LLFloaterDayCycle::LLFloaterDayCycle(const LLSD &key) : LLFloater(key) -{ -} - -// virtual -BOOL LLFloaterDayCycle::postBuild() -{ - sOriginalTitle = getTitle(); - - // *HACK commented out since this code isn't released (yet) - //llassert(LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue() && - // LLWLPacketScrubber::MAX_REGION_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue()); - - // add the time slider - LLMultiSliderCtrl* sldr = getChild<LLMultiSliderCtrl>("WLTimeSlider"); - - sldr->addSlider(); - - // load it up - initCallbacks(); - - return TRUE; -} - -LLFloaterDayCycle::~LLFloaterDayCycle() -{ -} - -void LLFloaterDayCycle::onClickHelp(void* data) -{ - std::string xml_alert = *(std::string *) data; - LLNotifications::instance().add(xml_alert, LLSD(), LLSD()); -} - -void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert) -{ - childSetAction(name, onClickHelp, new std::string(xml_alert)); -} - -void LLFloaterDayCycle::initCallbacks(void) -{ - initHelpBtn("WLDayCycleHelp", "HelpDayCycle"); - - // WL Day Cycle - childSetCommitCallback("WLTimeSlider", onTimeSliderMoved, NULL); - childSetCommitCallback("WLDayCycleKeys", onKeyTimeMoved, NULL); - childSetCommitCallback("WLCurKeyHour", onKeyTimeChanged, NULL); - childSetCommitCallback("WLCurKeyMin", onKeyTimeChanged, NULL); - childSetCommitCallback("WLKeyPresets", onKeyPresetChanged, NULL); - - childSetAction("WLAddKey", onAddKey, NULL); - childSetAction("WLDeleteKey", onDeleteKey, NULL); -} - -void LLFloaterDayCycle::syncMenu() -{ - // set time - LLMultiSliderCtrl* sldr = LLFloaterDayCycle::sDayCycle->getChild<LLMultiSliderCtrl>("WLTimeSlider"); - sldr->setCurSliderValue((F32)LLWLParamManager::getInstance()->mAnimator.getDayTime() * sHoursPerDay); - - // turn off Use Estate Time button if it's already being used - if( LLWLParamManager::getInstance()->mAnimator.getUseLindenTime()) - { - LLFloaterDayCycle::sDayCycle->childDisable("WLUseLindenTime"); - } - else - { - LLFloaterDayCycle::sDayCycle->childEnable("WLUseLindenTime"); - } -} - -void LLFloaterDayCycle::syncSliderTrack() -{ - // clear the slider - LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); - - kSldr->clear(); - sSliderToKey.clear(); - - // add sliders - - lldebugs << "Adding " << LLWLParamManager::getInstance()->mDay.mTimeMap.size() << " keys to slider" << llendl; - - std::map<F32, LLWLParamKey>::iterator mIt = - LLWLParamManager::getInstance()->mDay.mTimeMap.begin(); - for(; mIt != LLWLParamManager::getInstance()->mDay.mTimeMap.end(); mIt++) - { - addSliderKey(mIt->first * sHoursPerDay, mIt->second); - } -} - -void LLFloaterDayCycle::syncTrack() -{ - lldebugs << "Syncing track (" << sSliderToKey.size() << ")" << llendl; - - // if no keys, do nothing - if(sSliderToKey.size() == 0) - { - lldebugs << "No keys, not syncing" << llendl; - return; - } - - LLMultiSliderCtrl* sldr; - sldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLDayCycleKeys"); - llassert_always(sSliderToKey.size() == sldr->getValue().size()); - - LLMultiSliderCtrl* tSldr; - tSldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLTimeSlider"); - - // create a new animation track - LLWLParamManager::getInstance()->mDay.clearKeyframes(); - - // add the keys one by one - std::map<std::string, LLWLCycleSliderKey>::iterator mIt = sSliderToKey.begin(); - for(; mIt != sSliderToKey.end(); mIt++) - { - LLWLParamManager::getInstance()->mDay.addKeyframe(mIt->second.time / sHoursPerDay, - mIt->second.keyframe); - } - - // set the param manager's track to the new one - LLWLParamManager::getInstance()->resetAnimator( - tSldr->getCurSliderValue() / sHoursPerDay, false); - - LLWLParamManager::getInstance()->mAnimator.update( - LLWLParamManager::getInstance()->mCurParams); -} - -void LLFloaterDayCycle::refreshPresetsFromParamManager() -{ - LLComboBox* keyCombo = sDayCycle->getChild<LLComboBox>("WLKeyPresets"); - - if(keyCombo != NULL) - { - LLWLParamManager::preset_key_list_t preset_keys; - LLWLParamManager::instance().getPresetKeys(preset_keys); - for (LLWLParamManager::preset_key_list_t::const_iterator it = preset_keys.begin(); it != preset_keys.end(); ++it) - { - if (it->scope <= sScope) - { - const LLWLParamKey& key = *it; - llinfos << "Adding key: " << key.toString() << llendl; - keyCombo->add(key.toString(), LLSD(key.toStringVal())); - } - } - - // set defaults on combo boxes - keyCombo->selectFirstItem(); - } -} - -// static -LLFloaterDayCycle* LLFloaterDayCycle::instance() -{ - if (!sDayCycle) - { - lldebugs << "Instantiating Day Cycle floater" << llendl; - sDayCycle = LLFloaterReg::getTypedInstance<LLFloaterDayCycle>("env_day_cycle"); - llassert(sDayCycle); - // sDayCycle->open(); - // sDayCycle->setFocus(TRUE); - } - return sDayCycle; -} - -bool LLFloaterDayCycle::isOpen() -{ - if (sDayCycle != NULL) - { - return true; - } - return false; -} - -void LLFloaterDayCycle::show(LLEnvKey::EScope scope) -{ - LLFloaterDayCycle* dayCycle = instance(); - if(scope != sScope && ((LLView*)dayCycle)->getVisible()) - { - LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); - return; - } - sScope = scope; - std::string title = sOriginalTitle + " (" + LLEnvManager::getScopeString(sScope) + ")"; - dayCycle->setTitle(title); - refreshPresetsFromParamManager(); - dayCycle->syncMenu(); - syncSliderTrack(); - - // set drop-down menu to match preset of currently-selected keyframe (one is automatically selected initially) - const std::string& curSldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getCurSlider(); - if(strlen(curSldr.c_str()) > 0) // only do this if there is a curSldr, otherwise we put an invalid entry into the map - { - sDayCycle->getChild<LLComboBox>("WLKeyPresets")->selectByValue(sSliderToKey[curSldr].keyframe.toStringVal()); - } - - // comment in if you want the menu to rebuild each time - //LLUICtrlFactory::getInstance()->buildFloater(dayCycle, "floater_day_cycle_options.xml"); - //dayCycle->initCallbacks(); - - dayCycle->openFloater(); -} - -// virtual -void LLFloaterDayCycle::onClose(bool app_quitting) -{ - if (sDayCycle) - { - lldebugs << "Destorying Day Cycle floater" << llendl; - sDayCycle = NULL; - } -} - -void LLFloaterDayCycle::onTimeSliderMoved(LLUICtrl* ctrl, void* userData) -{ - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLTimeSlider"); - - /// get the slider value - F32 val = sldr->getCurSliderValue() / sHoursPerDay; - - // set the value, turn off animation - LLWLParamManager::getInstance()->mAnimator.setDayTime((F64)val); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - // then call update once - LLWLParamManager::getInstance()->mAnimator.update( - LLWLParamManager::getInstance()->mCurParams); -} - -void LLFloaterDayCycle::onKeyTimeMoved(LLUICtrl* ctrl, void* userData) -{ - LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>("WLKeyPresets"); - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); - LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyHour"); - LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyMin"); - - if(sldr->getValue().size() == 0) { - return; - } - - // make sure we have a slider - const std::string& curSldr = sldr->getCurSlider(); - if(curSldr == "") { - return; - } - - F32 time = sldr->getCurSliderValue(); - - // check to see if a key exists - LLWLParamKey key = sSliderToKey[curSldr].keyframe; - sSliderToKey[curSldr].time = time; - - // if it exists, turn on check box - comboBox->selectByValue(key.toStringVal()); - - // now set the spinners - F32 hour = (F32)((S32)time); - F32 min = (time - hour) * 60; - - // handle imprecision - if(min >= 59) { - min = 0; - hour += 1; - } - - hourSpin->set(hour); - minSpin->set(min); - - syncTrack(); - -} - -void LLFloaterDayCycle::onKeyTimeChanged(LLUICtrl* ctrl, void* userData) -{ - // if no keys, skipped - if(sSliderToKey.size() == 0) { - return; - } - - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLDayCycleKeys"); - LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>( - "WLCurKeyHour"); - LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>( - "WLCurKeyMin"); - - F32 hour = hourSpin->get(); - F32 min = minSpin->get(); - F32 val = hour + min / 60.0f; - - const std::string& curSldr = sldr->getCurSlider(); - sldr->setCurSliderValue(val, TRUE); - F32 time = sldr->getCurSliderValue() / sHoursPerDay; - - // now set the key's time in the sliderToKey map - sSliderToKey[curSldr].time = time; - - syncTrack(); -} - -void LLFloaterDayCycle::onKeyPresetChanged(LLUICtrl* ctrl, void* userData) -{ - // get the time - LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( - "WLKeyPresets"); - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLDayCycleKeys"); - - // do nothing if no sliders - if(sldr->getValue().size() == 0) { - return; - } - - // change the map - - std::string stringVal = comboBox->getSelectedValue().asString(); - LLWLParamKey newKey(stringVal); - const std::string& curSldr = sldr->getCurSlider(); - - // if null, don't use - if(curSldr == "") { - return; - } - - sSliderToKey[curSldr].keyframe = newKey; - - syncTrack(); -} - -void LLFloaterDayCycle::onAddKey(void* userData) -{ - LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( - "WLKeyPresets"); - LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLDayCycleKeys"); - LLMultiSliderCtrl* tSldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLTimeSlider"); - - llassert_always(sSliderToKey.size() == kSldr->getValue().size()); - - S32 max_sliders; - switch(sScope) - { - case LLEnvKey::SCOPE_LOCAL: - max_sliders = 20; // *HACK this should be LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES; - break; - case LLEnvKey::SCOPE_REGION: - max_sliders = 12; // *HACK this should be LLWLPacketScrubber::MAX_REGION_KEY_FRAMES; - break; - default: - max_sliders = (S32)kSldr->getMaxValue(); - break; - } - - if ((S32)sSliderToKey.size() >= max_sliders) - { - LLSD args; - args["SCOPE"] = LLEnvManager::getScopeString(sScope); - args["MAX"] = max_sliders; - LLNotificationsUtil::add("DayCycleTooManyKeyframes", args, LLSD(), LLNotificationFunctorRegistry::instance().DONOTHING); - return; - } - - // get the values - LLWLParamKey newKeyframe(comboBox->getSelectedValue()); - - // add the slider key - addSliderKey(tSldr->getCurSliderValue(), newKeyframe); - - syncTrack(); -} - -void LLFloaterDayCycle::addSliderKey(F32 time, LLWLParamKey keyframe) -{ - LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>( - "WLDayCycleKeys"); - - // make a slider - const std::string& sldrName = kSldr->addSlider(time); - if(sldrName == "") { - return; - } - - // set the key - LLWLCycleSliderKey newKey(keyframe, kSldr->getCurSliderValue()); - - llassert_always(sldrName != LLStringUtil::null); - - // add to map - sSliderToKey.insert(std::pair<std::string, LLWLCycleSliderKey>(sldrName, newKey)); - - llassert_always(sSliderToKey.size() == kSldr->getValue().size()); - -} - -void LLFloaterDayCycle::deletePreset(LLWLParamKey keyframe) -{ - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); - - /// delete any reference - std::map<std::string, LLWLCycleSliderKey>::iterator curr_preset, next_preset; - for(curr_preset = sSliderToKey.begin(); curr_preset != sSliderToKey.end(); curr_preset = next_preset) - { - next_preset = curr_preset; - ++next_preset; - if (curr_preset->second.keyframe == keyframe) - { - sldr->deleteSlider(curr_preset->first); - sSliderToKey.erase(curr_preset); - } - } -} - -void LLFloaterDayCycle::onDeleteKey(void* userData) -{ - if(sSliderToKey.size() == 0) - { - return; - } - else if(sSliderToKey.size() == 1) - { - LLNotifications::instance().add("EnvCannotDeleteLastDayCycleKey", LLSD(), LLSD()); - return; - } - - LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( - "WLKeyPresets"); - LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); - - // delete from map - const std::string& sldrName = sldr->getCurSlider(); - std::map<std::string, LLWLCycleSliderKey>::iterator mIt = sSliderToKey.find(sldrName); - sSliderToKey.erase(mIt); - - sldr->deleteCurSlider(); - - if(sSliderToKey.size() == 0) { - return; - } - - const std::string& name = sldr->getCurSlider(); - comboBox->selectByValue(sSliderToKey[name].keyframe.toLLSD()); - F32 time = sSliderToKey[name].time; - - LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyHour"); - LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyMin"); - - // now set the spinners - F32 hour = (F32)((S32)time); - F32 min = (time - hour) / 60; - hourSpin->set(hour); - minSpin->set(min); - - syncTrack(); - -} diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h deleted file mode 100644 index 1454298269..0000000000 --- a/indra/newview/llfloaterdaycycle.h +++ /dev/null @@ -1,131 +0,0 @@ -/** - * @file llfloaterdaycycle.h - * @brief LLFloaterDayCycle class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLFLOATERDAYCYCLE_H -#define LL_LLFLOATERDAYCYCLE_H - -#include "llfloater.h" - -#include <vector> -#include "llwlparamset.h" -#include "llwlanimator.h" -#include "llwlparammanager.h" - -struct WLColorControl; -struct WLFloatControl; - -/// convenience class for holding keyframes mapped to sliders -struct LLWLCycleSliderKey -{ -public: - LLWLCycleSliderKey(LLWLParamKey kf, F32 t) : keyframe(kf), time(t) {} - LLWLCycleSliderKey() : keyframe(), time(0.f) {} // Don't use this default constructor - - LLWLParamKey keyframe; - F32 time; -}; - -/// Menu for all of windlight's functionality. -/// Menuing system for adjusting the atmospheric settings of the world. -class LLFloaterDayCycle : public LLFloater -{ - LOG_CLASS(LLFloaterDayCycle); -public: - LLFloaterDayCycle(const LLSD &key); - virtual ~LLFloaterDayCycle(); - /*virtual*/ BOOL postBuild(); - - // map of sliders to parameters - static std::map<std::string, LLWLCycleSliderKey> sSliderToKey; - - /// help button stuff - static void onClickHelp(void* data); - void initHelpBtn(const std::string& name, const std::string& xml_alert); - - /// initialize all - void initCallbacks(void); - - /// one and one instance only - static LLFloaterDayCycle* instance(); - - /// on time slider moved - static void onTimeSliderMoved(LLUICtrl* ctrl, void* userData); - - /// what happens when you move the key frame - static void onKeyTimeMoved(LLUICtrl* ctrl, void* userData); - - /// what happens when you change the key frame's time - static void onKeyTimeChanged(LLUICtrl* ctrl, void* userData); - - /// if you change the combo box, change the frame - static void onKeyPresetChanged(LLUICtrl* ctrl, void* userData); - - /// add a new key on slider - static void onAddKey(void* userData); - - /// delete any and all reference to a preset - void deletePreset(LLWLParamKey keyframe); - - /// delete a key frame - static void onDeleteKey(void* userData); - - - //// menu management - - /// show off our menu - static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); - - /// return if the menu exists or not - static bool isOpen(); - - /// stuff to do on exit - virtual void onClose(bool app_quitting); - - /// sync up sliders with day cycle structure - static void syncMenu(); - - // makes sure key slider has what's in day cycle - static void syncSliderTrack(); - - /// makes sure day cycle data structure has what's in menu - static void syncTrack(); - - /// refresh combox box from param manager - static void refreshPresetsFromParamManager(); - - /// add a slider to the track - static void addSliderKey(F32 time, LLWLParamKey keyframe); - -private: - static LLFloaterDayCycle* sDayCycle; // one instance on the inside - static const F32 sHoursPerDay; - static LLEnvKey::EScope sScope; - static std::string sOriginalTitle; - static LLWLAnimator::ETime sPreviousTimeType; -}; - - -#endif diff --git a/indra/newview/llfloatereditdaycycle.cpp b/indra/newview/llfloatereditdaycycle.cpp index 165b271133..b63677b258 100644 --- a/indra/newview/llfloatereditdaycycle.cpp +++ b/indra/newview/llfloatereditdaycycle.cpp @@ -423,7 +423,7 @@ void LLFloaterEditDayCycle::onAddKey() if ((S32)mSliderToKey.size() >= max_sliders) { LLSD args; - args["SCOPE"] = LLEnvManager::getScopeString(scope); + args["SCOPE"] = LLEnvManagerNew::getScopeString(scope); args["MAX"] = max_sliders; LLNotificationsUtil::add("DayCycleTooManyKeyframes", args, LLSD(), LLNotificationFunctorRegistry::instance().DONOTHING); return; diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp deleted file mode 100644 index bb476e5d00..0000000000 --- a/indra/newview/llfloaterenvsettings.cpp +++ /dev/null @@ -1,254 +0,0 @@ -/** - * @file llfloaterenvsettings.cpp - * @brief LLFloaterEnvSettings class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloaterenvsettings.h" - -#include "llfloaterreg.h" -#include "llfloaterwindlight.h" -#include "llfloaterwater.h" -#include "llfloaterdaycycle.h" -#include "llfloaterregioninfo.h" -#include "lluictrlfactory.h" -#include "llsliderctrl.h" -#include "llcombobox.h" -#include "llcolorswatch.h" -#include "llwlanimator.h" -#include "llnotifications.h" - -#include "llwlparamset.h" -#include "llwlparammanager.h" -#include "llwaterparammanager.h" -#include "llmath.h" -#include "llviewerwindow.h" -#include "llviewercontrol.h" - -#include "llcheckboxctrl.h" - -#include "pipeline.h" - -#include <sstream> - -// LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL; - -LLFloaterEnvSettings::LLFloaterEnvSettings(const LLSD &key) : LLFloater(key) -{ - lldebugs << "Creating env settings floater" << llendl; -} - -LLFloaterEnvSettings::~LLFloaterEnvSettings() -{ -} - -// virtual -BOOL LLFloaterEnvSettings::postBuild() -{ - // load it up - initCallbacks(); - syncMenu(); - - return TRUE; -} - -void LLFloaterEnvSettings::initCallbacks(void) -{ - // our three sliders - childSetCommitCallback("EnvTimeSlider", &LLFloaterEnvSettings::onChangeDayTime, NULL); - childSetCommitCallback("EnvCloudSlider", &LLFloaterEnvSettings::onChangeCloudCoverage, NULL); - childSetCommitCallback("EnvWaterFogSlider", &LLFloaterEnvSettings::onChangeWaterFogDensity, &LLWaterParamManager::instance().mFogDensity); - - // color picker - childSetCommitCallback("EnvWaterColor", &LLFloaterEnvSettings::onChangeWaterColor, &LLWaterParamManager::instance().mFogColor); - - // WL Top - childSetCommitCallback("EnvAdvancedSkyButton", &LLFloaterEnvSettings::onOpenAdvancedSky, NULL); - childSetCommitCallback("EnvAdvancedWaterButton", &LLFloaterEnvSettings::onOpenAdvancedWater, NULL); - childSetCommitCallback("EnvUseEstateTimeButton", &LLFloaterEnvSettings::onUseEstateTime, NULL); - getChild<LLUICtrl>("EnvUseLocalTimeButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onUseLocalTime)); - - getChild<LLUICtrl>("EnvUseLocalTimeButton")->setRightMouseDownCallback(boost::bind(&LLEnvManagerNew::dumpUserPrefs, &LLEnvManagerNew::instance())); - getChild<LLUICtrl>("EnvUseEstateTimeButton")->setRightMouseDownCallback(boost::bind(&LLEnvManagerNew::dumpUserPrefs, &LLEnvManagerNew::instance())); -} - - -// menu maintenance functions - -void LLFloaterEnvSettings::syncMenu() -{ - LLSliderCtrl* sldr; - sldr = getChild<LLSliderCtrl>("EnvTimeSlider"); - - // sync the clock - F32 val = (F32)LLWLParamManager::getInstance()->mAnimator.getDayTime(); - std::string timeStr = LLWLAnimator::timeToString(val); - - LLTextBox* textBox; - textBox = getChild<LLTextBox>("EnvTimeText"); - - textBox->setValue(timeStr); - - // sync time slider which starts at 6 AM - val -= 0.25; - if(val < 0) - { - val++; - } - sldr->setValue(val); - - // sync cloud coverage - bool err; - childSetValue("EnvCloudSlider", LLWLParamManager::getInstance()->mCurParams.getFloat("cloud_shadow", err)); - - LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); - // sync water params - LLColor4 col = param_mgr->getFogColor(); - LLColorSwatchCtrl* colCtrl = getChild<LLColorSwatchCtrl>("EnvWaterColor"); - col.mV[3] = 1.0f; - colCtrl->set(col); - - childSetValue("EnvWaterFogSlider", param_mgr->mFogDensity.mExp); - param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp); - - // turn off Use Estate/Local Time buttons if already being used - - LLWLAnimator& anim = LLWLParamManager::getInstance()->mAnimator; - childSetEnabled("EnvUseEstateTimeButton", !anim.getIsRunning() || !anim.getUseLindenTime()); - childSetEnabled("EnvUseLocalTimeButton", !anim.getIsRunning() || !anim.getUseLocalTime()); - - if(!gPipeline.canUseVertexShaders()) - { - childDisable("EnvWaterColor"); - childDisable("EnvWaterColorText"); - //childDisable("EnvAdvancedWaterButton"); - } - else - { - childEnable("EnvWaterColor"); - childEnable("EnvWaterColorText"); - //childEnable("EnvAdvancedWaterButton"); - } - - // only allow access to these if they are using windlight - if(!gPipeline.canUseWindLightShaders()) - { - - childDisable("EnvCloudSlider"); - childDisable("EnvCloudText"); - //childDisable("EnvAdvancedSkyButton"); - } - else - { - childEnable("EnvCloudSlider"); - childEnable("EnvCloudText"); - //childEnable("EnvAdvancedSkyButton"); - } -} - -void LLFloaterEnvSettings::onChangeDayTime(LLUICtrl* ctrl, void* userData) -{ - LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(ctrl); - - // deactivate animator - LLWLParamManager::instance().mAnimator.deactivate(); - - F32 val = sldr->getValueF32() + 0.25f; - if(val > 1.0) - { - val--; - } - - LLWLParamManager::instance().mAnimator.setDayTime((F64)val); - LLWLParamManager::instance().mAnimator.update( - LLWLParamManager::instance().mCurParams); -} - -void LLFloaterEnvSettings::onChangeCloudCoverage(LLUICtrl* ctrl, void* userData) -{ - LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(ctrl); - - // deactivate animator - //LLWLParamManager::instance()->mAnimator.mIsRunning = false; - //LLWLParamManager::instance()->mAnimator.mUseLindenTime = false; - - F32 val = sldr->getValueF32(); - LLWLParamManager::instance().mCurParams.set("cloud_shadow", val); -} - -void LLFloaterEnvSettings::onChangeWaterFogDensity(LLUICtrl* ctrl, void* userData) -{ - LLSliderCtrl* sldr = static_cast<LLSliderCtrl*>(ctrl); - F32 val = sldr->getValueF32(); - - WaterExpFloatControl* expFloatControl = static_cast<WaterExpFloatControl*>(userData); - expFloatControl->mExp = val; - LLWaterParamManager::instance().setDensitySliderValue(val); - - expFloatControl->update(LLWaterParamManager::instance().mCurParams); - LLWaterParamManager::instance().propagateParameters(); -} - -void LLFloaterEnvSettings::onChangeWaterColor(LLUICtrl* ctrl, void* userData) -{ - LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl); - WaterColorControl* colorControl = static_cast<WaterColorControl*>(userData); - *colorControl = swatch->get(); - - colorControl->update(LLWaterParamManager::instance().mCurParams); - LLWaterParamManager::instance().propagateParameters(); -} - -void LLFloaterEnvSettings::onOpenAdvancedSky(void* userData1, void* userData2) -{ - // *TODO: make sure title is displayed correctly. - LLFloaterReg::showInstance("env_windlight"); -} - -void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData1, void* userData2) -{ - // *TODO: make sure title is displayed correctly. - LLFloaterReg::showInstance("env_water"); -} - - -void LLFloaterEnvSettings::onUseEstateTime(void* userData1, void* userData2) -{ - LLFloaterWindLight* wl = LLFloaterReg::findTypedInstance<LLFloaterWindLight>("env_windlight"); - if(wl) - { - LLComboBox* box = wl->getChild<LLComboBox>("WLPresetsCombo"); - box->selectByValue(""); - } - - LLWLParamManager::instance().mAnimator.activate(LLWLAnimator::TIME_LINDEN); -} - -// static -void LLFloaterEnvSettings::onUseLocalTime() -{ - LLWLParamManager::getInstance()->mAnimator.setDayTime(LLWLAnimator::getLocalTime()); - LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LOCAL); -} diff --git a/indra/newview/llfloaterenvsettings.h b/indra/newview/llfloaterenvsettings.h deleted file mode 100644 index b93bf07395..0000000000 --- a/indra/newview/llfloaterenvsettings.h +++ /dev/null @@ -1,89 +0,0 @@ -/** - * @file llfloaterskysettings.h - * @brief LLFloaterEnvSettings class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -/* - * Simple menu for adjusting the atmospheric settings of the world - */ - -#ifndef LL_LLFLOATERENVSETTINGS_H -#define LL_LLFLOATERENVSETTINGS_H - -#include "llfloater.h" - - -/// Menuing system for all of windlight's functionality -class LLFloaterEnvSettings : public LLFloater -{ - LOG_CLASS(LLFloaterEnvSettings); -public: - - LLFloaterEnvSettings(const LLSD &key); - /*virtual*/ ~LLFloaterEnvSettings(); - /*virtual*/ BOOL postBuild(); - - /// initialize all the callbacks for the menu - void initCallbacks(void); - - /// one and one instance only - LLFloaterEnvSettings* instance(); - - /// handle if time of day is changed - static void onChangeDayTime(LLUICtrl* ctrl, void* userData); - - /// handle if cloud coverage is changed - static void onChangeCloudCoverage(LLUICtrl* ctrl, void* userData); - - /// handle change in water fog density - static void onChangeWaterFogDensity(LLUICtrl* ctrl, void* expFloatControl); - - /// handle change in water fog color - static void onChangeWaterColor(LLUICtrl* ctrl, void* colorControl); - - /// open the advanced sky settings menu - static void onOpenAdvancedSky(void* userData1, void* userData2); - - /// open the advanced water settings menu - static void onOpenAdvancedWater(void* userData1, void* userData2); - - /// sync time with the server - static void onUseEstateTime(void* userData1, void* userData2); - - /// sync time with local clock - static void onUseLocalTime(); - - - //// menu management - - /// sync up sliders with parameters - void syncMenu(); - -private: - // one instance on the inside - -}; - - -#endif diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index d84f4c26c4..07c0878877 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -55,14 +55,12 @@ #include "lldaycyclemanager.h" #include "llenvmanager.h" #include "llfilepicker.h" -#include "llfloaterdaycycle.h" #include "llfloatergodtools.h" // for send_sim_wide_deletes() #include "llfloatertopobjects.h" // added to fix SL-32336 #include "llfloatergroups.h" #include "llfloaterreg.h" #include "llfloaterregiondebugconsole.h" #include "llfloatertelehub.h" -#include "llfloaterwindlight.h" #include "llinventorymodel.h" #include "lllineeditor.h" #include "llnamelistctrl.h" @@ -93,9 +91,6 @@ #include "llagentui.h" #include "llmeshrepository.h" -// contains includes needed for WL estate settings -#include "llfloaterwater.h" - const S32 TERRAIN_TEXTURE_COUNT = 4; const S32 CORNER_COUNT = 4; @@ -1151,36 +1146,11 @@ BOOL LLPanelRegionTerrainInfo::validateTextureSizes() // LLPanelRegionTerrainInfo ///////////////////////////////////////////////////////////////////////////// // Initialize statics -LLPanelRegionTerrainInfo* LLPanelRegionTerrainInfo::sPanelRegionTerrainInfo = NULL; - -// static -LLPanelRegionTerrainInfo* LLPanelRegionTerrainInfo::instance() -{ - if (!sPanelRegionTerrainInfo) - { - sPanelRegionTerrainInfo = LLFloaterRegionInfo::getPanelRegionTerrain(); - lldebugs << llformat("Instantiating sPanelRegionTerrainInfo: %p", sPanelRegionTerrainInfo) << llendl; - } - return sPanelRegionTerrainInfo; -} - -// static -void LLPanelRegionTerrainInfo::onFloaterClose(bool app_quitting) -{ - if (sPanelRegionTerrainInfo) - { - lldebugs << "Setting LLPanelRegionTerrainInfo to NULL" << llendl; - sPanelRegionTerrainInfo = NULL; - } -} BOOL LLPanelRegionTerrainInfo::postBuild() { LLPanelRegionInfo::postBuild(); - sPanelRegionTerrainInfo = this; // singleton instance pointer - lldebugs << llformat("Setting sPanelRegionTerrainInfo to: %p", sPanelRegionTerrainInfo) << llendl; - initCtrl("water_height_spin"); initCtrl("terrain_raise_spin"); initCtrl("terrain_lower_spin"); @@ -1207,20 +1177,9 @@ BOOL LLPanelRegionTerrainInfo::postBuild() return LLPanelRegionInfo::postBuild(); } -F32 LLPanelRegionTerrainInfo::getSunHour() -{ - if (childIsEnabled("sun_hour_slider")) - { - return (F32)childGetValue("sun_hour_slider").asReal(); - } - return 0.f; -} - // virtual bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region) { - //LLEnvManager::instance().maybeClearEditingScope(LLEnvKey::SCOPE_REGION, false, false); - BOOL owner_or_god = gAgent.isGodlike() || (region && (region->getOwner() == gAgent.getID())); BOOL owner_or_god_or_manager = owner_or_god @@ -1398,65 +1357,6 @@ bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, con return false; } -#ifndef TMP_DISABLE_WLES -/////////////////////////////////////////////////////////////// -// Callbacks for Environment tab of Region panel - -void LLPanelRegionTerrainInfo::onOpenAdvancedSky(void* userData) -{ - LLFloaterWindLight::show(LLEnvKey::SCOPE_REGION); -} - -void LLPanelRegionTerrainInfo::onOpenAdvancedWater(void* userData) -{ - LLFloaterWater::show(LLEnvKey::SCOPE_REGION); -} - - -void LLPanelRegionTerrainInfo::onUseEstateTime(void* userData) -{ - if(LLFloaterWindLight::isOpen()) - { - // select the blank value in - LLFloaterWindLight* wl = LLFloaterWindLight::instance(); - LLComboBox* box = wl->getChild<LLComboBox>("WLPresetsCombo"); - box->selectByValue(""); - } - - LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LINDEN); -} - -/////////////////////////////////////////////////////// -// Advanced handling for WL region estate integration - -// Handle commit of WL settings to region -void LLPanelRegionTerrainInfo::onCommitRegionWL(void* userData) -{ - LLEnvManager::getInstance()->commitSettings(LLEnvKey::SCOPE_REGION); - LLEnvManager::getInstance()->maybeClearEditingScope(LLEnvKey::SCOPE_REGION, true, false); -} - -// Handle cancel of WL settings for region -void LLPanelRegionTerrainInfo::onCancelRegionWL(void* userData) -{ - LLEnvManager::getInstance()->maybeClearEditingScope(LLEnvKey::SCOPE_REGION, true, false); -} - -// Handle reversion of region WL settings to default -void LLPanelRegionTerrainInfo::onSetRegionToDefaultWL(void* userData) -{ - LLEnvManager::instance().resetInternalsToDefault(LLEnvKey::SCOPE_REGION); - LLEnvManager::instance().startEditingScope(LLEnvKey::SCOPE_REGION); -} - -// static -void LLPanelRegionTerrainInfo::onApplyCurrentWL(void* userData) -{ - // Immediately apply current environment settings to region. - LLEnvManager::instance().applyLocalSettingsToRegion(); -} -#endif // TMP_DISABLE_WLES - ///////////////////////////////////////////////////////////////////////////// // LLPanelEstateInfo // @@ -2120,16 +2020,6 @@ bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region) return rv; } -// virtual -void LLFloaterRegionInfo::onClose(bool app_quitting) -{ - if(!app_quitting) - { - //LLEnvManager::getInstance()->maybeClearEditingScope(true, false); - LLPanelRegionTerrainInfo::onFloaterClose(app_quitting); - } -} - void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl) { if (checkRemovalButton(child_ctrl->getName())) diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 810a71f463..4809937324 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -74,8 +74,6 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); - /*virtual*/ void onClose(bool app_quitting); - static void processEstateOwnerRequest(LLMessageSystem* msg, void**); // get and process region info if necessary. @@ -227,11 +225,8 @@ public: LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {} ~LLPanelRegionTerrainInfo() {} - static LLPanelRegionTerrainInfo* instance(); virtual BOOL postBuild(); // LLPanel - static void onFloaterClose(bool app_quitting); - F32 getSunHour(); virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator void setEnvControls(bool available); // Whether environment settings are available for this region @@ -239,26 +234,12 @@ public: //static void onChangeAnything(LLUICtrl* ctrl, void* userData); // callback for any change, to enable commit button - static LLPanelRegionTerrainInfo* sPanelRegionTerrainInfo; // static instance pointer for singleton - virtual BOOL sendUpdate(); - void onChangeUseEstateTime(); - void onChangeFixedSun(); - void onChangeSunHour(); - static void onClickDownloadRaw(void*); static void onClickUploadRaw(void*); static void onClickBakeTerrain(void*); bool callbackBakeTerrain(const LLSD& notification, const LLSD& response); - - static void onOpenAdvancedSky(void* userData); // open the advanced sky settings menu - static void onOpenAdvancedWater(void* userData); // open the advanced water settings menu - static void onUseEstateTime(void* userData); // sync time with the server - static void onCommitRegionWL(void* userData); // commit region information to server - static void onCancelRegionWL(void* userData); // cancel changes to region - static void onSetRegionToDefaultWL(void* userData); // revert region WL settings to default - static void onApplyCurrentWL(void* userData); // apply current settings to region }; ///////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp deleted file mode 100644 index 4d647f30f5..0000000000 --- a/indra/newview/llfloaterwater.cpp +++ /dev/null @@ -1,662 +0,0 @@ -/** - * @file llfloaterwater.cpp - * @brief LLFloaterWater class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloaterwater.h" - -#include "pipeline.h" -#include "llsky.h" - -#include "llfloaterreg.h" -#include "llsliderctrl.h" -#include "llspinctrl.h" -#include "llcolorswatch.h" -#include "llcheckboxctrl.h" -#include "lltexturectrl.h" -#include "lluictrlfactory.h" -#include "llviewercamera.h" -#include "llcombobox.h" -#include "lllineeditor.h" -#include "llnotificationsutil.h" -#include "llfloaterdaycycle.h" -#include "llboost.h" -#include "llmultisliderctrl.h" -#include "llnotifications.h" - -#include "v4math.h" -#include "llviewerdisplay.h" -#include "llviewercontrol.h" -#include "llviewerwindow.h" -#include "llsavedsettingsglue.h" - -#include "llwaterparamset.h" -#include "llwaterparammanager.h" -#include "llpostprocess.h" - -#undef max - -std::set<std::string> LLFloaterWater::sDefaultPresets; -LLEnvKey::EScope LLFloaterWater::sScope; -std::string LLFloaterWater::sOriginalTitle; - -LLFloaterWater::LLFloaterWater(const LLSD& key) - : LLFloater(key) -{ -} - -LLFloaterWater::~LLFloaterWater() -{ -} -BOOL LLFloaterWater::postBuild() -{ - sOriginalTitle=getTitle(); - std::string def_water = getString("WLDefaultWaterNames"); - - // no editing or deleting of the blank string - sDefaultPresets.insert(""); - boost_tokenizer tokens(def_water, boost::char_separator<char>(":")); - for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter) - { - std::string tok(*token_iter); - sDefaultPresets.insert(tok); - } - - // add the combo boxes - LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo"); - - if(comboBox != NULL) { - - LLWaterParamManager::preset_name_list_t presets; - LLWaterParamManager::instance().getPresetNames(presets); - for (LLWaterParamManager::preset_name_list_t::const_iterator it = presets.begin(); it != presets.end(); ++it) - { - comboBox->add(*it); - } - - // set defaults on combo boxes - comboBox->selectByValue(LLEnvManagerNew::instance().getWaterPresetName()); - } - // load it up - initCallbacks(); - syncMenu(); - return TRUE; -} - -// static -void LLFloaterWater::show(LLEnvKey::EScope scope) -{ - LLFloaterWater* water = LLFloaterReg::getTypedInstance<LLFloaterWater>("env_water"); - llassert(water); - - if(scope != sScope && ((LLView*)water)->getVisible()) - { - LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); - return; - } - sScope = scope; - std::string scope_str = ""; - switch(sScope) - { - case LLEnvKey::SCOPE_LOCAL: - scope_str = LLTrans::getString("LocalSettings"); - break; - case LLEnvKey::SCOPE_REGION: - scope_str = LLTrans::getString("RegionSettings"); - break; - } - std::string title = sOriginalTitle + " (" + scope_str + ")"; - water->setTitle(title); - water->syncMenu(); - - LLEnvManager::instance().startEditingScope(scope); - - water->openFloater(); - -} - -void LLFloaterWater::initCallbacks(void) { - - LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); - - getChild<LLUICtrl>("WaterFogColor")->setCommitCallback(boost::bind(&LLFloaterWater::onWaterFogColorMoved, this, _1, ¶m_mgr->mFogColor)); - - // - getChild<LLUICtrl>("WaterGlow")->setCommitCallback(boost::bind(&LLFloaterWater::onColorControlAMoved, this, _1, ¶m_mgr->mFogColor)); - - // fog density - getChild<LLUICtrl>("WaterFogDensity")->setCommitCallback(boost::bind(&LLFloaterWater::onExpFloatControlMoved, this, _1, ¶m_mgr->mFogDensity)); - getChild<LLUICtrl>("WaterUnderWaterFogMod")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mUnderWaterFogMod)); - - // blue density - getChild<LLUICtrl>("WaterNormalScaleX")->setCommitCallback(boost::bind(&LLFloaterWater::onVector3ControlXMoved, this, _1, ¶m_mgr->mNormalScale)); - getChild<LLUICtrl>("WaterNormalScaleY")->setCommitCallback(boost::bind(&LLFloaterWater::onVector3ControlYMoved, this, _1, ¶m_mgr->mNormalScale)); - getChild<LLUICtrl>("WaterNormalScaleZ")->setCommitCallback(boost::bind(&LLFloaterWater::onVector3ControlZMoved, this, _1, ¶m_mgr->mNormalScale)); - - // fresnel - getChild<LLUICtrl>("WaterFresnelScale")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mFresnelScale)); - getChild<LLUICtrl>("WaterFresnelOffset")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mFresnelOffset)); - - // scale above/below - getChild<LLUICtrl>("WaterScaleAbove")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mScaleAbove)); - getChild<LLUICtrl>("WaterScaleBelow")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mScaleBelow)); - - // blur mult - getChild<LLUICtrl>("WaterBlurMult")->setCommitCallback(boost::bind(&LLFloaterWater::onFloatControlMoved, this, _1, ¶m_mgr->mBlurMultiplier)); - - // Load/save -// getChild<LLUICtrl>("WaterLoadPreset")->setCommitCallback(boost::bind(&LLFloaterWater::onLoadPreset, this)); - getChild<LLUICtrl>("WaterNewPreset")->setCommitCallback(boost::bind(&LLFloaterWater::onNewPreset, this)); - getChild<LLUICtrl>("WaterSavePreset")->setCommitCallback(boost::bind(&LLFloaterWater::onSavePreset, this)); - getChild<LLUICtrl>("WaterDeletePreset")->setCommitCallback(boost::bind(&LLFloaterWater::onDeletePreset, this)); - - // wave direction - getChild<LLUICtrl>("WaterWave1DirX")->setCommitCallback(boost::bind(&LLFloaterWater::onVector2ControlXMoved, this, _1, ¶m_mgr->mWave1Dir)); - getChild<LLUICtrl>("WaterWave1DirY")->setCommitCallback(boost::bind(&LLFloaterWater::onVector2ControlYMoved, this, _1, ¶m_mgr->mWave1Dir)); - getChild<LLUICtrl>("WaterWave2DirX")->setCommitCallback(boost::bind(&LLFloaterWater::onVector2ControlXMoved, this, _1, ¶m_mgr->mWave2Dir)); - getChild<LLUICtrl>("WaterWave2DirY")->setCommitCallback(boost::bind(&LLFloaterWater::onVector2ControlYMoved, this, _1, ¶m_mgr->mWave2Dir)); - - getChild<LLUICtrl>("WaterPresetsCombo")->setCommitCallback(boost::bind(&LLFloaterWater::onChangePresetName, this, _1)); - - LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap"); - textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL); - getChild<LLUICtrl>("WaterNormalMap")->setCommitCallback(boost::bind(&LLFloaterWater::onNormalMapPicked, this, _1)); -} - -bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& response) -{ - std::string text = response["message"].asString(); - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - - if(text == "") - { - return false; - } - - if(option == 0) { - LLComboBox* comboBox = getChild<LLComboBox>( "WaterPresetsCombo"); - - LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); - - // add the current parameters to the list - // see if it's there first - // if not there, add a new one - if (!param_mgr->hasParamSet(text)) - { - param_mgr->addParamSet(text, param_mgr->mCurParams); - comboBox->add(text); - comboBox->sortByName(); - - comboBox->setSelectedByValue(text, true); - - param_mgr->savePreset(text); - - // otherwise, send a message to the user - } - else - { - LLNotificationsUtil::add("ExistsWaterPresetAlert"); - } - } - return false; -} - -void LLFloaterWater::syncMenu() -{ - bool err; - - LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); - - LLWaterParamSet & current_params = param_mgr->mCurParams; - - // blue horizon - param_mgr->mFogColor = current_params.getVector4(param_mgr->mFogColor.mName, err); - - LLColor4 col = param_mgr->getFogColor(); - getChild<LLUICtrl>("WaterGlow")->setValue(col.mV[3]); - col.mV[3] = 1.0f; - LLColorSwatchCtrl* colCtrl = getChild<LLColorSwatchCtrl>("WaterFogColor"); - - colCtrl->set(col); - - // fog and wavelets - param_mgr->mFogDensity.mExp = - log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) / - log(param_mgr->mFogDensity.mBase); - param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp); - getChild<LLUICtrl>("WaterFogDensity")->setValue(param_mgr->mFogDensity.mExp); - - param_mgr->mUnderWaterFogMod.mX = - current_params.getFloat(param_mgr->mUnderWaterFogMod.mName, err); - getChild<LLUICtrl>("WaterUnderWaterFogMod")->setValue(param_mgr->mUnderWaterFogMod.mX); - - param_mgr->mNormalScale = current_params.getVector3(param_mgr->mNormalScale.mName, err); - getChild<LLUICtrl>("WaterNormalScaleX")->setValue(param_mgr->mNormalScale.mX); - getChild<LLUICtrl>("WaterNormalScaleY")->setValue(param_mgr->mNormalScale.mY); - getChild<LLUICtrl>("WaterNormalScaleZ")->setValue(param_mgr->mNormalScale.mZ); - - // Fresnel - param_mgr->mFresnelScale.mX = current_params.getFloat(param_mgr->mFresnelScale.mName, err); - getChild<LLUICtrl>("WaterFresnelScale")->setValue(param_mgr->mFresnelScale.mX); - param_mgr->mFresnelOffset.mX = current_params.getFloat(param_mgr->mFresnelOffset.mName, err); - getChild<LLUICtrl>("WaterFresnelOffset")->setValue(param_mgr->mFresnelOffset.mX); - - // Scale Above/Below - param_mgr->mScaleAbove.mX = current_params.getFloat(param_mgr->mScaleAbove.mName, err); - getChild<LLUICtrl>("WaterScaleAbove")->setValue(param_mgr->mScaleAbove.mX); - param_mgr->mScaleBelow.mX = current_params.getFloat(param_mgr->mScaleBelow.mName, err); - getChild<LLUICtrl>("WaterScaleBelow")->setValue(param_mgr->mScaleBelow.mX); - - // blur mult - param_mgr->mBlurMultiplier.mX = current_params.getFloat(param_mgr->mBlurMultiplier.mName, err); - getChild<LLUICtrl>("WaterBlurMult")->setValue(param_mgr->mBlurMultiplier.mX); - - // wave directions - param_mgr->mWave1Dir = current_params.getVector2(param_mgr->mWave1Dir.mName, err); - getChild<LLUICtrl>("WaterWave1DirX")->setValue(param_mgr->mWave1Dir.mX); - getChild<LLUICtrl>("WaterWave1DirY")->setValue(param_mgr->mWave1Dir.mY); - - param_mgr->mWave2Dir = current_params.getVector2(param_mgr->mWave2Dir.mName, err); - getChild<LLUICtrl>("WaterWave2DirX")->setValue(param_mgr->mWave2Dir.mX); - getChild<LLUICtrl>("WaterWave2DirY")->setValue(param_mgr->mWave2Dir.mY); - - LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap"); - textCtrl->setImageAssetID(param_mgr->getNormalMapID()); -} - - -// vector control callbacks -void LLFloaterWater::onVector3ControlXMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - vectorControl->mX = sldrCtrl->getValueF32(); - - vectorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -// vector control callbacks -void LLFloaterWater::onVector3ControlYMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - vectorControl->mY = sldrCtrl->getValueF32(); - - vectorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -// vector control callbacks -void LLFloaterWater::onVector3ControlZMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - vectorControl->mZ = sldrCtrl->getValueF32(); - - vectorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - - -// vector control callbacks -void LLFloaterWater::onVector2ControlXMoved(LLUICtrl* ctrl, WaterVector2Control* vectorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - vectorControl->mX = sldrCtrl->getValueF32(); - - vectorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -// vector control callbacks -void LLFloaterWater::onVector2ControlYMoved(LLUICtrl* ctrl, WaterVector2Control* vectorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - vectorControl->mY = sldrCtrl->getValueF32(); - - vectorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -// color control callbacks -void LLFloaterWater::onColorControlRMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - colorControl->mR = sldrCtrl->getValueF32(); - - // move i if it's the max - if(colorControl->mR >= colorControl->mG - && colorControl->mR >= colorControl->mB - && colorControl->mHasSliderName) - { - colorControl->mI = colorControl->mR; - std::string name = colorControl->mSliderName; - name.append("I"); - - getChild<LLUICtrl>(name)->setValue(colorControl->mR); - } - - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onColorControlGMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - colorControl->mG = sldrCtrl->getValueF32(); - - // move i if it's the max - if(colorControl->mG >= colorControl->mR - && colorControl->mG >= colorControl->mB - && colorControl->mHasSliderName) - { - colorControl->mI = colorControl->mG; - std::string name = colorControl->mSliderName; - name.append("I"); - - getChild<LLUICtrl>(name)->setValue(colorControl->mG); - - } - - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onColorControlBMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - colorControl->mB = sldrCtrl->getValueF32(); - - // move i if it's the max - if(colorControl->mB >= colorControl->mR - && colorControl->mB >= colorControl->mG - && colorControl->mHasSliderName) - { - colorControl->mI = colorControl->mB; - std::string name = colorControl->mSliderName; - name.append("I"); - - getChild<LLUICtrl>(name)->setValue(colorControl->mB); - } - - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onColorControlAMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - colorControl->mA = sldrCtrl->getValueF32(); - - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - - LLWaterParamManager::getInstance()->propagateParameters(); -} - - -void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - colorControl->mI = sldrCtrl->getValueF32(); - - // only for sliders where we pass a name - if(colorControl->mHasSliderName) - { - // set it to the top - F32 maxVal = std::max(std::max(colorControl->mR, colorControl->mG), colorControl->mB); - F32 iVal; - - iVal = colorControl->mI; - - // get the names of the other sliders - std::string rName = colorControl->mSliderName; - rName.append("R"); - std::string gName = colorControl->mSliderName; - gName.append("G"); - std::string bName = colorControl->mSliderName; - bName.append("B"); - - // handle if at 0 - if(iVal == 0) - { - colorControl->mR = 0; - colorControl->mG = 0; - colorControl->mB = 0; - - // if all at the start - // set them all to the intensity - } - else if (maxVal == 0) - { - colorControl->mR = iVal; - colorControl->mG = iVal; - colorControl->mB = iVal; - } - else - { - // add delta amounts to each - F32 delta = (iVal - maxVal) / maxVal; - colorControl->mR *= (1.0f + delta); - colorControl->mG *= (1.0f + delta); - colorControl->mB *= (1.0f + delta); - } - - // set the sliders to the new vals - getChild<LLUICtrl>(rName)->setValue(colorControl->mR); - getChild<LLUICtrl>(gName)->setValue(colorControl->mG); - getChild<LLUICtrl>(bName)->setValue(colorControl->mB); - } - - // now update the current parameters and send them to shaders - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onExpFloatControlMoved(LLUICtrl* ctrl, WaterExpFloatControl* expFloatControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - F32 val = sldrCtrl->getValueF32(); - expFloatControl->mExp = val; - LLWaterParamManager::getInstance()->setDensitySliderValue(val); - - expFloatControl->update(LLWaterParamManager::getInstance()->mCurParams); - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onFloatControlMoved(LLUICtrl* ctrl, WaterFloatControl* floatControl) -{ - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - floatControl->mX = sldrCtrl->getValueF32() / floatControl->mMult; - - floatControl->update(LLWaterParamManager::getInstance()->mCurParams); - LLWaterParamManager::getInstance()->propagateParameters(); -} -void LLFloaterWater::onWaterFogColorMoved(LLUICtrl* ctrl, WaterColorControl* colorControl) -{ - LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl); - *colorControl = swatch->get(); - - colorControl->update(LLWaterParamManager::getInstance()->mCurParams); - LLWaterParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWater::onNormalMapPicked(LLUICtrl* ctrl) -{ - LLTextureCtrl* textCtrl = static_cast<LLTextureCtrl*>(ctrl); - LLUUID textID = textCtrl->getImageAssetID(); - LLWaterParamManager::getInstance()->setNormalMapID(textID); -} - -void LLFloaterWater::onNewPreset() -{ - LLNotificationsUtil::add("NewWaterPreset", LLSD(), LLSD(), boost::bind(&LLFloaterWater::newPromptCallback, this, _1, _2)); -} - -void LLFloaterWater::onSavePreset() -{ - // get the name - LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo"); - - // don't save the empty name - if(comboBox->getSelectedItemLabel() == "") - { - return; - } - - LLWaterParamManager::getInstance()->mCurParams.mName = - comboBox->getSelectedItemLabel(); - - // check to see if it's a default and shouldn't be overwritten - std::set<std::string>::iterator sIt = sDefaultPresets.find( - comboBox->getSelectedItemLabel()); - if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets")) - { - LLNotificationsUtil::add("WLNoEditDefault"); - return; - } - - LLNotificationsUtil::add("WLSavePresetAlert", LLSD(), LLSD(), boost::bind(&LLFloaterWater::saveAlertCallback, this, _1, _2)); -} - -bool LLFloaterWater::saveAlertCallback(const LLSD& notification, const LLSD& response) -{ - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - // if they choose save, do it. Otherwise, don't do anything - if(option == 0) - { - LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); - - param_mgr->setParamSet( - param_mgr->mCurParams.mName, - param_mgr->mCurParams); - - // comment this back in to save to file - param_mgr->savePreset(param_mgr->mCurParams.mName); - } - return false; -} - -void LLFloaterWater::onDeletePreset() -{ - LLComboBox* combo_box = getChild<LLComboBox>("WaterPresetsCombo"); - - if(combo_box->getSelectedValue().asString() == "") - { - return; - } - - LLSD args; - args["SKY"] = combo_box->getSelectedValue().asString(); - LLNotificationsUtil::add("WLDeletePresetAlert", args, LLSD(), boost::bind(&LLFloaterWater::deleteAlertCallback, this, _1, _2)); -} - -bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& response) -{ - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - // if they choose delete, do it. Otherwise, don't do anything - if(option == 0) - { - LLComboBox* combo_box = getChild<LLComboBox>("WaterPresetsCombo"); - LLFloaterDayCycle* day_cycle = LLFloaterReg::findTypedInstance<LLFloaterDayCycle>("env_day_cycle"); - LLComboBox* key_combo = NULL; - - if (day_cycle) - { - key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets"); - } - - std::string name = combo_box->getSelectedValue().asString(); - - // check to see if it's a default and shouldn't be deleted - std::set<std::string>::iterator sIt = sDefaultPresets.find(name); - if(sIt != sDefaultPresets.end()) - { - LLNotificationsUtil::add("WaterNoEditDefault"); - return false; - } - - LLWaterParamManager::getInstance()->removeParamSet(name, true); - - // remove and choose another - S32 new_index = combo_box->getCurrentIndex(); - - combo_box->remove(name); - - if(key_combo != NULL) - { - key_combo->remove(name); - - // water is not part of day cycles, yet - //day_cycle->deletePreset(name); - } - - // pick the previously selected index after delete - if(new_index > 0) - { - new_index--; - } - - if(combo_box->getItemCount() > 0) - { - combo_box->setCurrentByIndex(new_index); - } - } - return false; -} - - -void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl) -{ - std::string data = ctrl->getValue().asString(); - if(!data.empty()) - { -#if 0 - LLWaterParamManager::instance().loadPreset(data); -#else - LLEnvManagerNew::instance().setUseWaterPreset(data); -#endif - syncMenu(); - } -} - diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h deleted file mode 100644 index 25858fba01..0000000000 --- a/indra/newview/llfloaterwater.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * @file llfloaterwindlight.h - * @brief LLFloaterWater class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -/* - * Menu for adjusting the atmospheric settings of the world - */ - -#ifndef LL_LLFLOATER_WATER_H -#define LL_LLFLOATER_WATER_H - -#include "llfloater.h" - -#include "llenvmanager.h" - -struct WaterVector2Control; -struct WaterVector3Control; -struct WaterColorControl; -struct WaterFloatControl; -struct WaterExpFloatControl; - -/// Menuing system for all of windlight's functionality -class LLFloaterWater : public LLFloater -{ -public: - - LLFloaterWater(const LLSD& key); - virtual ~LLFloaterWater(); - /*virtual*/ BOOL postBuild(); - /// initialize all - void initCallbacks(void); - - static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); - - bool newPromptCallback(const LLSD& notification, const LLSD& response); - - /// general purpose callbacks for dealing with color controllers - void onColorControlRMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - void onColorControlGMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - void onColorControlBMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - void onColorControlAMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - void onColorControlIMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - - void onVector3ControlXMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl); - void onVector3ControlYMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl); - void onVector3ControlZMoved(LLUICtrl* ctrl, WaterVector3Control* vectorControl); - - void onVector2ControlXMoved(LLUICtrl* ctrl, WaterVector2Control* vectorControl); - void onVector2ControlYMoved(LLUICtrl* ctrl, WaterVector2Control* vectorControl); - - void onFloatControlMoved(LLUICtrl* ctrl, WaterFloatControl* floatControl); - - void onExpFloatControlMoved(LLUICtrl* ctrl, WaterExpFloatControl* expFloatControl); - - void onWaterFogColorMoved(LLUICtrl* ctrl, WaterColorControl* colorControl); - - /// handle if they choose a new normal map - void onNormalMapPicked(LLUICtrl* ctrl); - - /// when user hits the load preset button - void onNewPreset(); - - /// when user hits the save preset button - void onSavePreset(); - - /// prompts a user when overwriting a preset - bool saveAlertCallback(const LLSD& notification, const LLSD& response); - - /// when user hits the save preset button - void onDeletePreset(); - - /// prompts a user when overwriting a preset - bool deleteAlertCallback(const LLSD& notification, const LLSD& response); - - /// what to do when you change the preset name - void onChangePresetName(LLUICtrl* ctrl); - - /// sync up sliders with parameters - void syncMenu(); - -private: - static std::set<std::string> sDefaultPresets; - static LLEnvKey::EScope sScope; - static std::string sOriginalTitle; -}; - - -#endif diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp deleted file mode 100644 index 43c61f2994..0000000000 --- a/indra/newview/llfloaterwindlight.cpp +++ /dev/null @@ -1,1003 +0,0 @@ -/** - * @file llfloaterwindlight.cpp - * @brief LLFloaterWindLight class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloaterwindlight.h" - -#include "pipeline.h" -#include "llsky.h" - -#include "llfloaterreg.h" -#include "llsliderctrl.h" -#include "llmultislider.h" -#include "llmultisliderctrl.h" -#include "llspinctrl.h" -#include "llcheckboxctrl.h" -#include "lluictrlfactory.h" -#include "llviewercamera.h" -#include "llcombobox.h" -#include "lllineeditor.h" -#include "llfloaterdaycycle.h" -#include "llboost.h" -#include "llnotifications.h" - -#include "v4math.h" -#include "llviewerdisplay.h" -#include "llviewercontrol.h" -#include "llviewerwindow.h" -#include "llsavedsettingsglue.h" - -#include "llwlparamset.h" -#include "llwlparammanager.h" -#include "llpostprocess.h" - -#undef max - -// *TODO: Remove this class in favor of LLFloaterEditSky - -LLFloaterWindLight* LLFloaterWindLight::sWindLight = NULL; -std::set<LLWLParamKey> LLFloaterWindLight::sDefaultPresets; -LLEnvKey::EScope LLFloaterWindLight::sScope; -std::string LLFloaterWindLight::sOriginalTitle; - -static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f; - -LLFloaterWindLight::LLFloaterWindLight(const LLSD &key) : LLFloater(key) -{ -} - -BOOL LLFloaterWindLight::postBuild() -{ - sWindLight = this; - sOriginalTitle = getTitle(); - - // add the combo boxes - LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo"); - - if(comboBox != NULL) { - - LLWLParamManager::preset_key_list_t preset_keys; - LLWLParamManager::instance().getPresetKeys(preset_keys); - for (LLWLParamManager::preset_key_list_t::const_iterator it = preset_keys.begin(); it != preset_keys.end(); ++it) - { - const LLWLParamKey& key = *it; - std::string item_title = key.name; - if (key.scope == LLEnvKey::SCOPE_REGION) - { - item_title += std::string(" (") + LLTrans::getString("Region") + std::string(")"); - } - - comboBox->add(item_title, key.toLLSD()); - } - - // entry for when we're in estate time - comboBox->add(LLStringUtil::null); - - // set defaults on combo boxes - LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance(); - comboBox->selectByValue(env_mgr.getUseFixedSky() ? env_mgr.getSkyPresetName() : LLStringUtil::null); - } - - // add the list of presets - std::string def_days = getString("WLDefaultSkyNames"); - - // no editing or deleting of the blank string - LLWLParamKey blank("", LLEnvKey::SCOPE_LOCAL); - sDefaultPresets.insert(blank); - boost_tokenizer tokens(def_days, boost::char_separator<char>(":")); - for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter) - { - std::string tok(*token_iter); - LLWLParamKey key(tok, LLEnvKey::SCOPE_LOCAL); - sDefaultPresets.insert(key); - } - - // load it up - initCallbacks(); - - return TRUE; -} - -LLFloaterWindLight::~LLFloaterWindLight() -{ -} - -void LLFloaterWindLight::initCallbacks(void) -{ - LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); - - // blue horizon - childSetCommitCallback("WLBlueHorizonR", onColorControlRMoved, ¶m_mgr->mBlueHorizon); - childSetCommitCallback("WLBlueHorizonG", onColorControlGMoved, ¶m_mgr->mBlueHorizon); - childSetCommitCallback("WLBlueHorizonB", onColorControlBMoved, ¶m_mgr->mBlueHorizon); - childSetCommitCallback("WLBlueHorizonI", onColorControlIMoved, ¶m_mgr->mBlueHorizon); - - // haze density, horizon, mult, and altitude - childSetCommitCallback("WLHazeDensity", onColorControlRMoved, ¶m_mgr->mHazeDensity); - childSetCommitCallback("WLHazeHorizon", onColorControlRMoved, ¶m_mgr->mHazeHorizon); - childSetCommitCallback("WLDensityMult", onFloatControlMoved, ¶m_mgr->mDensityMult); - childSetCommitCallback("WLMaxAltitude", onFloatControlMoved, ¶m_mgr->mMaxAlt); - - // blue density - childSetCommitCallback("WLBlueDensityR", onColorControlRMoved, ¶m_mgr->mBlueDensity); - childSetCommitCallback("WLBlueDensityG", onColorControlGMoved, ¶m_mgr->mBlueDensity); - childSetCommitCallback("WLBlueDensityB", onColorControlBMoved, ¶m_mgr->mBlueDensity); - childSetCommitCallback("WLBlueDensityI", onColorControlIMoved, ¶m_mgr->mBlueDensity); - - // Lighting - - // sunlight - childSetCommitCallback("WLSunlightR", onColorControlRMoved, ¶m_mgr->mSunlight); - childSetCommitCallback("WLSunlightG", onColorControlGMoved, ¶m_mgr->mSunlight); - childSetCommitCallback("WLSunlightB", onColorControlBMoved, ¶m_mgr->mSunlight); - childSetCommitCallback("WLSunlightI", onColorControlIMoved, ¶m_mgr->mSunlight); - - // glow - childSetCommitCallback("WLGlowR", onGlowRMoved, ¶m_mgr->mGlow); - childSetCommitCallback("WLGlowB", onGlowBMoved, ¶m_mgr->mGlow); - - // ambient - childSetCommitCallback("WLAmbientR", onColorControlRMoved, ¶m_mgr->mAmbient); - childSetCommitCallback("WLAmbientG", onColorControlGMoved, ¶m_mgr->mAmbient); - childSetCommitCallback("WLAmbientB", onColorControlBMoved, ¶m_mgr->mAmbient); - childSetCommitCallback("WLAmbientI", onColorControlIMoved, ¶m_mgr->mAmbient); - - // time of day - childSetCommitCallback("WLSunAngle", onSunMoved, ¶m_mgr->mLightnorm); - childSetCommitCallback("WLEastAngle", onSunMoved, ¶m_mgr->mLightnorm); - - // Clouds - - // Cloud Color - childSetCommitCallback("WLCloudColorR", onColorControlRMoved, ¶m_mgr->mCloudColor); - childSetCommitCallback("WLCloudColorG", onColorControlGMoved, ¶m_mgr->mCloudColor); - childSetCommitCallback("WLCloudColorB", onColorControlBMoved, ¶m_mgr->mCloudColor); - childSetCommitCallback("WLCloudColorI", onColorControlIMoved, ¶m_mgr->mCloudColor); - - // Cloud - childSetCommitCallback("WLCloudX", onColorControlRMoved, ¶m_mgr->mCloudMain); - childSetCommitCallback("WLCloudY", onColorControlGMoved, ¶m_mgr->mCloudMain); - childSetCommitCallback("WLCloudDensity", onColorControlBMoved, ¶m_mgr->mCloudMain); - - // Cloud Detail - childSetCommitCallback("WLCloudDetailX", onColorControlRMoved, ¶m_mgr->mCloudDetail); - childSetCommitCallback("WLCloudDetailY", onColorControlGMoved, ¶m_mgr->mCloudDetail); - childSetCommitCallback("WLCloudDetailDensity", onColorControlBMoved, ¶m_mgr->mCloudDetail); - - // Cloud extras - childSetCommitCallback("WLCloudCoverage", onFloatControlMoved, ¶m_mgr->mCloudCoverage); - childSetCommitCallback("WLCloudScale", onFloatControlMoved, ¶m_mgr->mCloudScale); - childSetCommitCallback("WLCloudLockX", onCloudScrollXToggled, NULL); - childSetCommitCallback("WLCloudLockY", onCloudScrollYToggled, NULL); - childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL); - childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL); - childSetCommitCallback("WLDistanceMult", onFloatControlMoved, ¶m_mgr->mDistanceMult); - - // WL Top - childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL); - // Load/save - LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo"); - - //childSetAction("WLLoadPreset", onLoadPreset, comboBox); - childSetAction("WLNewPreset", onNewPreset, comboBox); - childSetAction("WLSavePreset", onSavePreset, comboBox); - childSetAction("WLDeletePreset", onDeletePreset, comboBox); - - comboBox->setCommitCallback(boost::bind(&LLFloaterWindLight::onChangePresetName, _1)); - - // Dome - childSetCommitCallback("WLGamma", onFloatControlMoved, ¶m_mgr->mWLGamma); - childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL); -} - -bool LLFloaterWindLight::newPromptCallback(const LLSD& notification, const LLSD& response) -{ - llassert(sWindLight); - std::string text = response["message"].asString(); - LLWLParamKey newKey(text, LLEnvKey::SCOPE_LOCAL); - S32 option = LLNotification::getSelectedOption(notification, response); - - if(text == "") - { - return false; - } - - if(option == 0) { - LLComboBox* comboBox = sWindLight->getChild<LLComboBox>( - "WLPresetsCombo"); - - LLFloaterDayCycle* sDayCycle = NULL; - LLComboBox* keyCombo = NULL; - if(LLFloaterDayCycle::isOpen()) - { - sDayCycle = LLFloaterDayCycle::instance(); - keyCombo = sDayCycle->getChild<LLComboBox>( - "WLKeyPresets"); - } - - // add the current parameters to the list - // see if it's there first - // if not there, add a new one - if (!LLWLParamManager::instance().hasParamSet(newKey)) - { - LLWLParamManager::getInstance()->addParamSet(newKey, - LLWLParamManager::getInstance()->mCurParams); - comboBox->add(newKey.toString(), newKey.toLLSD()); - comboBox->sortByName(); - - // add a blank to the bottom - comboBox->selectFirstItem(); - if(comboBox->getSimple() == "") - { - comboBox->remove(0); - } - comboBox->add(LLStringUtil::null); - - comboBox->setSelectedByValue(text, true); - if(LLFloaterDayCycle::isOpen()) - { - keyCombo->add(text); - keyCombo->sortByName(); - } - LLWLParamManager::getInstance()->savePreset(newKey); - - // otherwise, send a message to the user - } - else - { - LLNotifications::instance().add("ExistsSkyPresetAlert", LLSD(), LLSD()); - } - } - return false; -} - -void LLFloaterWindLight::syncMenu() -{ - bool err; - - LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); - - LLWLParamSet& currentParams = param_mgr->mCurParams; - //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues; - - // blue horizon - param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err); - childSetValue("WLBlueHorizonR", param_mgr->mBlueHorizon.r / 2.0); - childSetValue("WLBlueHorizonG", param_mgr->mBlueHorizon.g / 2.0); - childSetValue("WLBlueHorizonB", param_mgr->mBlueHorizon.b / 2.0); - childSetValue("WLBlueHorizonI", - std::max(param_mgr->mBlueHorizon.r / 2.0, - std::max(param_mgr->mBlueHorizon.g / 2.0, - param_mgr->mBlueHorizon.b / 2.0))); - - // haze density, horizon, mult, and altitude - param_mgr->mHazeDensity = currentParams.getVector(param_mgr->mHazeDensity.mName, err); - childSetValue("WLHazeDensity", param_mgr->mHazeDensity.r); - param_mgr->mHazeHorizon = currentParams.getVector(param_mgr->mHazeHorizon.mName, err); - childSetValue("WLHazeHorizon", param_mgr->mHazeHorizon.r); - param_mgr->mDensityMult = currentParams.getVector(param_mgr->mDensityMult.mName, err); - childSetValue("WLDensityMult", param_mgr->mDensityMult.x * - param_mgr->mDensityMult.mult); - param_mgr->mMaxAlt = currentParams.getVector(param_mgr->mMaxAlt.mName, err); - childSetValue("WLMaxAltitude", param_mgr->mMaxAlt.x); - - // blue density - param_mgr->mBlueDensity = currentParams.getVector(param_mgr->mBlueDensity.mName, err); - childSetValue("WLBlueDensityR", param_mgr->mBlueDensity.r / 2.0); - childSetValue("WLBlueDensityG", param_mgr->mBlueDensity.g / 2.0); - childSetValue("WLBlueDensityB", param_mgr->mBlueDensity.b / 2.0); - childSetValue("WLBlueDensityI", - std::max(param_mgr->mBlueDensity.r / 2.0, - std::max(param_mgr->mBlueDensity.g / 2.0, param_mgr->mBlueDensity.b / 2.0))); - - // Lighting - - // sunlight - param_mgr->mSunlight = currentParams.getVector(param_mgr->mSunlight.mName, err); - childSetValue("WLSunlightR", param_mgr->mSunlight.r / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLSunlightG", param_mgr->mSunlight.g / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLSunlightB", param_mgr->mSunlight.b / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLSunlightI", - std::max(param_mgr->mSunlight.r / WL_SUN_AMBIENT_SLIDER_SCALE, - std::max(param_mgr->mSunlight.g / WL_SUN_AMBIENT_SLIDER_SCALE, param_mgr->mSunlight.b / WL_SUN_AMBIENT_SLIDER_SCALE))); - - // glow - param_mgr->mGlow = currentParams.getVector(param_mgr->mGlow.mName, err); - childSetValue("WLGlowR", 2 - param_mgr->mGlow.r / 20.0f); - childSetValue("WLGlowB", -param_mgr->mGlow.b / 5.0f); - - // ambient - param_mgr->mAmbient = currentParams.getVector(param_mgr->mAmbient.mName, err); - childSetValue("WLAmbientR", param_mgr->mAmbient.r / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLAmbientG", param_mgr->mAmbient.g / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLAmbientB", param_mgr->mAmbient.b / WL_SUN_AMBIENT_SLIDER_SCALE); - childSetValue("WLAmbientI", - std::max(param_mgr->mAmbient.r / WL_SUN_AMBIENT_SLIDER_SCALE, - std::max(param_mgr->mAmbient.g / WL_SUN_AMBIENT_SLIDER_SCALE, param_mgr->mAmbient.b / WL_SUN_AMBIENT_SLIDER_SCALE))); - - childSetValue("WLSunAngle", param_mgr->mCurParams.getFloat("sun_angle",err) / F_TWO_PI); - childSetValue("WLEastAngle", param_mgr->mCurParams.getFloat("east_angle",err) / F_TWO_PI); - - // Clouds - - // Cloud Color - param_mgr->mCloudColor = currentParams.getVector(param_mgr->mCloudColor.mName, err); - childSetValue("WLCloudColorR", param_mgr->mCloudColor.r); - childSetValue("WLCloudColorG", param_mgr->mCloudColor.g); - childSetValue("WLCloudColorB", param_mgr->mCloudColor.b); - childSetValue("WLCloudColorI", - std::max(param_mgr->mCloudColor.r, - std::max(param_mgr->mCloudColor.g, param_mgr->mCloudColor.b))); - - // Cloud - param_mgr->mCloudMain = currentParams.getVector(param_mgr->mCloudMain.mName, err); - childSetValue("WLCloudX", param_mgr->mCloudMain.r); - childSetValue("WLCloudY", param_mgr->mCloudMain.g); - childSetValue("WLCloudDensity", param_mgr->mCloudMain.b); - - // Cloud Detail - param_mgr->mCloudDetail = currentParams.getVector(param_mgr->mCloudDetail.mName, err); - childSetValue("WLCloudDetailX", param_mgr->mCloudDetail.r); - childSetValue("WLCloudDetailY", param_mgr->mCloudDetail.g); - childSetValue("WLCloudDetailDensity", param_mgr->mCloudDetail.b); - - // Cloud extras - param_mgr->mCloudCoverage = currentParams.getVector(param_mgr->mCloudCoverage.mName, err); - param_mgr->mCloudScale = currentParams.getVector(param_mgr->mCloudScale.mName, err); - childSetValue("WLCloudCoverage", param_mgr->mCloudCoverage.x); - childSetValue("WLCloudScale", param_mgr->mCloudScale.x); - - // cloud scrolling - bool lockX = !param_mgr->mCurParams.getEnableCloudScrollX(); - bool lockY = !param_mgr->mCurParams.getEnableCloudScrollY(); - childSetValue("WLCloudLockX", lockX); - childSetValue("WLCloudLockY", lockY); - - // disable if locked, enable if not - if(lockX) - { - childDisable("WLCloudScrollX"); - } else { - childEnable("WLCloudScrollX"); - } - if(lockY) - { - childDisable("WLCloudScrollY"); - } else { - childEnable("WLCloudScrollY"); - } - - // *HACK cloud scrolling is off my an additive of 10 - childSetValue("WLCloudScrollX", param_mgr->mCurParams.getCloudScrollX() - 10.0f); - childSetValue("WLCloudScrollY", param_mgr->mCurParams.getCloudScrollY() - 10.0f); - - param_mgr->mDistanceMult = currentParams.getVector(param_mgr->mDistanceMult.mName, err); - childSetValue("WLDistanceMult", param_mgr->mDistanceMult.x); - - // Tweak extras - - param_mgr->mWLGamma = currentParams.getVector(param_mgr->mWLGamma.mName, err); - childSetValue("WLGamma", param_mgr->mWLGamma.x); - - childSetValue("WLStarAlpha", param_mgr->mCurParams.getStarBrightness()); -} - - -// static -LLFloaterWindLight* LLFloaterWindLight::instance() -{ - if (!sWindLight) - { - lldebugs << "Creating WL floater" << llendl; - sWindLight = LLFloaterReg::getTypedInstance<LLFloaterWindLight>("env_windlight"); - llassert(sWindLight); - } - return sWindLight; -} - -// static -void LLFloaterWindLight::show(LLEnvKey::EScope scope) -{ - LLFloaterWindLight* windLight = instance(); - if(scope != sScope && ((LLView*)windLight)->getVisible()) - { - LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); - return; - } - sScope = scope; - std::string scope_str = ""; - switch(sScope) - { - case LLEnvKey::SCOPE_LOCAL: - scope_str = LLTrans::getString("LocalSettings"); - break; - case LLEnvKey::SCOPE_REGION: - scope_str = LLTrans::getString("RegionSettings"); - break; - } - std::string title = sOriginalTitle + " (" + scope_str + ")"; - windLight->setTitle(title); - windLight->syncMenu(); - - LLEnvManager::instance().startEditingScope(scope); - - // comment in if you want the menu to rebuild each time - //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml"); - //windLight->initCallbacks(); - - windLight->openFloater(); -} - -bool LLFloaterWindLight::isOpen() -{ - return LLFloater::isShown(sWindLight); -} - -// virtual -void LLFloaterWindLight::onClose(bool app_quitting) -{ - lldebugs << "Destroying WL floater" << llendl; - sWindLight = NULL; -} - -// color control callbacks -void LLFloaterWindLight::onColorControlRMoved(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - colorControl->r = sldrCtrl->getValueF32(); - if(colorControl->isSunOrAmbientColor) { - colorControl->r *= 3; - } - if(colorControl->isBlueHorizonOrDensity) { - colorControl->r *= 2; - } - - // move i if it's the max - if(colorControl->r >= colorControl->g && colorControl->r >= colorControl->b - && colorControl->hasSliderName) { - colorControl->i = colorControl->r; - std::string name = colorControl->mSliderName; - name.append("I"); - - if(colorControl->isSunOrAmbientColor) { - sWindLight->childSetValue(name, colorControl->r / 3); - } else if(colorControl->isBlueHorizonOrDensity) { - sWindLight->childSetValue(name, colorControl->r / 2); - } else { - sWindLight->childSetValue(name, colorControl->r); - } - } - - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onColorControlGMoved(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - colorControl->g = sldrCtrl->getValueF32(); - if(colorControl->isSunOrAmbientColor) { - colorControl->g *= 3; - } - if(colorControl->isBlueHorizonOrDensity) { - colorControl->g *= 2; - } - - // move i if it's the max - if(colorControl->g >= colorControl->r && colorControl->g >= colorControl->b - && colorControl->hasSliderName) { - colorControl->i = colorControl->g; - std::string name = colorControl->mSliderName; - name.append("I"); - - if(colorControl->isSunOrAmbientColor) { - sWindLight->childSetValue(name, colorControl->g / 3); - } else if(colorControl->isBlueHorizonOrDensity) { - sWindLight->childSetValue(name, colorControl->g / 2); - } else { - sWindLight->childSetValue(name, colorControl->g); - } - } - - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onColorControlBMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - colorControl->b = sldrCtrl->getValueF32(); - if(colorControl->isSunOrAmbientColor) { - colorControl->b *= 3; - } - if(colorControl->isBlueHorizonOrDensity) { - colorControl->b *= 2; - } - - // move i if it's the max - if(colorControl->b >= colorControl->r && colorControl->b >= colorControl->g - && colorControl->hasSliderName) { - colorControl->i = colorControl->b; - std::string name = colorControl->mSliderName; - name.append("I"); - - if(colorControl->isSunOrAmbientColor) { - sWindLight->childSetValue(name, colorControl->b / 3); - } else if(colorControl->isBlueHorizonOrDensity) { - sWindLight->childSetValue(name, colorControl->b / 2); - } else { - sWindLight->childSetValue(name, colorControl->b); - } - } - - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onColorControlIMoved(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - colorControl->i = sldrCtrl->getValueF32(); - - // only for sliders where we pass a name - if(colorControl->hasSliderName) { - - // set it to the top - F32 maxVal = std::max(std::max(colorControl->r, colorControl->g), colorControl->b); - F32 iVal; - - if(colorControl->isSunOrAmbientColor) - { - iVal = colorControl->i * 3; - } - else if(colorControl->isBlueHorizonOrDensity) - { - iVal = colorControl->i * 2; - } - else - { - iVal = colorControl->i; - } - - // get the names of the other sliders - std::string rName = colorControl->mSliderName; - rName.append("R"); - std::string gName = colorControl->mSliderName; - gName.append("G"); - std::string bName = colorControl->mSliderName; - bName.append("B"); - - // handle if at 0 - if(iVal == 0) { - colorControl->r = 0; - colorControl->g = 0; - colorControl->b = 0; - - // if all at the start - // set them all to the intensity - } else if (maxVal == 0) { - colorControl->r = iVal; - colorControl->g = iVal; - colorControl->b = iVal; - - } else { - - // add delta amounts to each - F32 delta = (iVal - maxVal) / maxVal; - colorControl->r *= (1.0f + delta); - colorControl->g *= (1.0f + delta); - colorControl->b *= (1.0f + delta); - } - - // divide sun color vals by three - if(colorControl->isSunOrAmbientColor) - { - sWindLight->childSetValue(rName, colorControl->r/3); - sWindLight->childSetValue(gName, colorControl->g/3); - sWindLight->childSetValue(bName, colorControl->b/3); - - } - else if(colorControl->isBlueHorizonOrDensity) - { - sWindLight->childSetValue(rName, colorControl->r/2); - sWindLight->childSetValue(gName, colorControl->g/2); - sWindLight->childSetValue(bName, colorControl->b/2); - - } - else - { - // set the sliders to the new vals - sWindLight->childSetValue(rName, colorControl->r); - sWindLight->childSetValue(gName, colorControl->g); - sWindLight->childSetValue(bName, colorControl->b); - } - } - - // now update the current parameters and send them to shaders - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - LLWLParamManager::getInstance()->propagateParameters(); -} - -/// GLOW SPECIFIC CODE -void LLFloaterWindLight::onGlowRMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - // scaled by 20 - colorControl->r = (2 - sldrCtrl->getValueF32()) * 20; - - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - LLWLParamManager::getInstance()->propagateParameters(); -} - -/// \NOTE that we want NEGATIVE (-) B -void LLFloaterWindLight::onGlowBMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - /// \NOTE that we want NEGATIVE (-) B and NOT by 20 as 20 is too big - colorControl->b = -sldrCtrl->getValueF32() * 5; - - colorControl->update(LLWLParamManager::getInstance()->mCurParams); - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onFloatControlMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - WLFloatControl * floatControl = static_cast<WLFloatControl *>(userData); - - floatControl->x = sldrCtrl->getValueF32() / floatControl->mult; - - floatControl->update(LLWLParamManager::getInstance()->mCurParams); - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onBoolToggle(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl); - - bool value = cbCtrl->get(); - (*(static_cast<BOOL *>(userData))) = value; -} - - -// Lighting callbacks - -// time of day -void LLFloaterWindLight::onSunMoved(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sunSldr = sWindLight->getChild<LLSliderCtrl>("WLSunAngle"); - LLSliderCtrl* eastSldr = sWindLight->getChild<LLSliderCtrl>("WLEastAngle"); - - WLColorControl * colorControl = static_cast<WLColorControl *>(userData); - - // get the two angles - LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); - - param_mgr->mCurParams.setSunAngle(F_TWO_PI * sunSldr->getValueF32()); - param_mgr->mCurParams.setEastAngle(F_TWO_PI * eastSldr->getValueF32()); - - // set the sun vector - colorControl->r = -sin(param_mgr->mCurParams.getEastAngle()) * - cos(param_mgr->mCurParams.getSunAngle()); - colorControl->g = sin(param_mgr->mCurParams.getSunAngle()); - colorControl->b = cos(param_mgr->mCurParams.getEastAngle()) * - cos(param_mgr->mCurParams.getSunAngle()); - colorControl->i = 1.f; - - colorControl->update(param_mgr->mCurParams); - param_mgr->propagateParameters(); -} - -void LLFloaterWindLight::onFloatTweakMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - F32 * tweak = static_cast<F32 *>(userData); - - (*tweak) = sldrCtrl->getValueF32(); - LLWLParamManager::getInstance()->propagateParameters(); -} - -void LLFloaterWindLight::onStarAlphaMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - LLWLParamManager::getInstance()->mCurParams.setStarBrightness(sldrCtrl->getValueF32()); -} - -void LLFloaterWindLight::onNewPreset(void* userData) -{ - LLNotifications::instance().add("NewSkyPreset", LLSD(), LLSD(), newPromptCallback); -} - -void LLFloaterWindLight::onSavePreset(void* userData) -{ - llassert(sWindLight); - // get the name - LLComboBox* comboBox = sWindLight->getChild<LLComboBox>( - "WLPresetsCombo"); - - // don't save the empty name - if(comboBox->getSelectedItemLabel() == "") - { - return; - } - - // If region scope, save immediately. - // We don't actually save to file in this case, but just update the preset - // so that the changes can be uploaded to server. - LLWLParamKey key(comboBox->getSelectedValue()); - if (key.scope == LLEnvKey::SCOPE_REGION) - { - // *TODO: Eliminate code duplication. - LL_DEBUGS("Windlight") << "Saving region sky preset: " << key.name << llendl; - LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); - param_mgr->mCurParams.mName = key.name; - param_mgr->setParamSet(key, param_mgr->mCurParams); - return; - } - - // check to see if it's a default and shouldn't be overwritten - std::set<LLWLParamKey>::iterator sIt = sDefaultPresets.find(LLWLParamKey(key)); - if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("SkyEditPresets")) - { - LLNotifications::instance().add("WLNoEditDefault", LLSD(), LLSD()); - return; - } - - LLWLParamManager::getInstance()->mCurParams.mName = - comboBox->getSelectedItemLabel(); - - LLNotifications::instance().add("WLSavePresetAlert", LLSD(), LLSD(), saveAlertCallback); -} - -bool LLFloaterWindLight::saveAlertCallback(const LLSD& notification, const LLSD& response) -{ - S32 option = LLNotification::getSelectedOption(notification, response); - // if they choose save, do it. Otherwise, don't do anything - if(option == 0) - { - LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); - - // we should only "save" local presets; those with other scopes should be "save as" - LLWLParamKey key(param_mgr->mCurParams.mName, LLEnvKey::SCOPE_LOCAL); - - param_mgr->setParamSet(key, param_mgr->mCurParams); - - // comment this back in to save to file - param_mgr->savePreset(key); - } - return false; -} - -void LLFloaterWindLight::onDeletePreset(void* userData) -{ - llassert(sWindLight); - LLComboBox* combo_box = sWindLight->getChild<LLComboBox>( - "WLPresetsCombo"); - - if(combo_box->getSelectedValue().isUndefined()) - { - return; - } - - LLSD args; - args["SKY"] = combo_box->getSelectedValue()[0].asString(); - LLNotifications::instance().add("WLDeletePresetAlert", args, LLSD(), - boost::bind(&LLFloaterWindLight::deleteAlertCallback, sWindLight, _1, _2)); -} - -bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLSD& response) -{ - S32 option = LLNotification::getSelectedOption(notification, response); - - // if they choose delete, do it. Otherwise, don't do anything - if(option == 0) - { - LLComboBox* combo_box = getChild<LLComboBox>( - "WLPresetsCombo"); - LLFloaterDayCycle* day_cycle = NULL; - LLComboBox* key_combo = NULL; - LLMultiSliderCtrl* mult_sldr = NULL; - - if(LLFloaterDayCycle::isOpen()) - { - day_cycle = LLFloaterDayCycle::instance(); - key_combo = day_cycle->getChild<LLComboBox>( - "WLKeyPresets"); - mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys"); - } - - LLWLParamKey key(combo_box->getSelectedValue()); - - // check to see if it's a default and shouldn't be deleted - std::set<LLWLParamKey>::iterator sIt = sDefaultPresets.find(key); - if(sIt != sDefaultPresets.end()) - { - LLNotifications::instance().add("WLNoEditDefault", LLSD(), LLSD()); - return false; - } - - LLWLParamManager::getInstance()->removeParamSet(key, true); - - // remove and choose another - S32 new_index = combo_box->getCurrentIndex(); - - combo_box->remove(key.toString()); - if(key_combo != NULL) - { - key_combo->remove(key.toString()); - - // remove from slider, as well - day_cycle->deletePreset(key); - } - - // pick the previously selected index after delete - if(new_index > 0) - { - new_index--; - } - - if(combo_box->getItemCount() > 0) - { - combo_box->setCurrentByIndex(new_index); - } - } - return false; -} - - -void LLFloaterWindLight::onChangePresetName(LLUICtrl* ctrl) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl); - - if(combo_box->getSimple() == "") - { - return; - } - -#if 0 - LLWLParamManager::getInstance()->loadPreset(LLWLParamKey(combo_box->getSelectedValue())); -#else - LLEnvManagerNew::instance().setUseSkyPreset(LLWLParamKey(combo_box->getSelectedValue()).name); -#endif - sWindLight->syncMenu(); -} - -void LLFloaterWindLight::onOpenDayCycle(void* userData) -{ - LLFloaterDayCycle::show(sScope); -} - -// Clouds -void LLFloaterWindLight::onCloudScrollXMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - // *HACK all cloud scrolling is off by an additive of 10. - LLWLParamManager::getInstance()->mCurParams.setCloudScrollX(sldrCtrl->getValueF32() + 10.0f); -} - -void LLFloaterWindLight::onCloudScrollYMoved(LLUICtrl* ctrl, void* userData) -{ - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl); - - // *HACK all cloud scrolling is off by an additive of 10. - LLWLParamManager::getInstance()->mCurParams.setCloudScrollY(sldrCtrl->getValueF32() + 10.0f); -} - -void LLFloaterWindLight::onCloudScrollXToggled(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl); - - bool lock = cbCtrl->get(); - LLWLParamManager::getInstance()->mCurParams.setEnableCloudScrollX(!lock); - - LLSliderCtrl* sldr = sWindLight->getChild<LLSliderCtrl>( - "WLCloudScrollX"); - - if(cbCtrl->get()) - { - sldr->setEnabled(false); - } - else - { - sldr->setEnabled(true); - } - -} - -void LLFloaterWindLight::onCloudScrollYToggled(LLUICtrl* ctrl, void* userData) -{ - llassert(sWindLight); - LLWLParamManager::getInstance()->mAnimator.deactivate(); - - LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl); - bool lock = cbCtrl->get(); - LLWLParamManager::getInstance()->mCurParams.setEnableCloudScrollY(!lock); - - LLSliderCtrl* sldr = sWindLight->getChild<LLSliderCtrl>( - "WLCloudScrollY"); - - if(cbCtrl->get()) - { - sldr->setEnabled(false); - } - else - { - sldr->setEnabled(true); - } -} diff --git a/indra/newview/llfloaterwindlight.h b/indra/newview/llfloaterwindlight.h deleted file mode 100644 index c2607816e5..0000000000 --- a/indra/newview/llfloaterwindlight.h +++ /dev/null @@ -1,131 +0,0 @@ -/** - * @file llfloaterwindlight.h - * @brief LLFloaterWindLight class definition - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -/* - * Menu for adjusting the atmospheric settings of the world - */ - -#ifndef LL_LLFLOATERWINDLIGHT_H -#define LL_LLFLOATERWINDLIGHT_H - -#include "llfloater.h" - -#include <vector> -#include "llwlparamset.h" -#include "llwlparammanager.h" - -struct WLColorControl; -struct WLFloatControl; - -/// Menuing system for all of windlight's functionality -class LLFloaterWindLight : public LLFloater -{ - LOG_CLASS(LLFloaterWindLight); -public: - LLFloaterWindLight(const LLSD &key); - virtual ~LLFloaterWindLight(); - BOOL postBuild(); - - /// initialize all - void initCallbacks(void); - - /// one and one instance only - static LLFloaterWindLight* instance(); - - static bool newPromptCallback(const LLSD& notification, const LLSD& response); - - /// general purpose callbacks for dealing with color controllers - static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); - static void onColorControlGMoved(LLUICtrl* ctrl, void* userData); - static void onColorControlBMoved(LLUICtrl* ctrl, void* userData); - static void onColorControlIMoved(LLUICtrl* ctrl, void* userData); - static void onFloatControlMoved(LLUICtrl* ctrl, void* userData); - static void onBoolToggle(LLUICtrl* ctrl, void* userData); - - /// lighting callbacks for glow - static void onGlowRMoved(LLUICtrl* ctrl, void* userData); - //static void onGlowGMoved(LLUICtrl* ctrl, void* userData); - static void onGlowBMoved(LLUICtrl* ctrl, void* userData); - - /// lighting callbacks for sun - static void onSunMoved(LLUICtrl* ctrl, void* userData); - - /// handle if float is changed - static void onFloatTweakMoved(LLUICtrl* ctrl, void* userData); - - /// for handling when the star slider is moved to adjust the alpha - static void onStarAlphaMoved(LLUICtrl* ctrl, void* userData); - - /// when user hits the load preset button - static void onNewPreset(void* userData); - - /// when user hits the save preset button - static void onSavePreset(void* userData); - - /// prompts a user when overwriting a preset - static bool saveAlertCallback(const LLSD& notification, const LLSD& response); - - /// when user hits the save preset button - static void onDeletePreset(void* userData); - - /// prompts a user when overwriting a preset - bool deleteAlertCallback(const LLSD& notification, const LLSD& response); - - /// what to do when you change the preset name - static void onChangePresetName(LLUICtrl* ctrl); - - /// when user hits the save preset button - static void onOpenDayCycle(void* userData); - - /// handle cloud scrolling - static void onCloudScrollXMoved(LLUICtrl* ctrl, void* userData); - static void onCloudScrollYMoved(LLUICtrl* ctrl, void* userData); - static void onCloudScrollXToggled(LLUICtrl* ctrl, void* userData); - static void onCloudScrollYToggled(LLUICtrl* ctrl, void* userData); - - //// menu management - - /// show off our menu - static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); - - /// return if the menu exists or not - static bool isOpen(); - - /// stuff to do on exit - virtual void onClose(bool app_quitting); - - /// sync up sliders with parameters - void syncMenu(); - -private: - static LLFloaterWindLight* sWindLight; // one instance on the inside - static std::set<LLWLParamKey> sDefaultPresets; - static LLEnvKey::EScope sScope; - static std::string sOriginalTitle; -}; - - -#endif diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 670b35aa71..6ae8e79be4 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -48,7 +48,6 @@ #include "llfloaterbulkpermission.h" #include "llfloaterbump.h" #include "llfloatercamera.h" -#include "llfloaterdaycycle.h" #include "llfloaterdeleteenvpreset.h" #include "llfloaterdisplayname.h" #include "llfloatereditdaycycle.h" @@ -57,7 +56,6 @@ #include "llfloaterenvironmentsettings.h" #include "llfloaterevent.h" #include "llfloatersearch.h" -#include "llfloaterenvsettings.h" #include "llfloaterfonttest.h" #include "llfloatergesture.h" #include "llfloatergodtools.h" @@ -106,9 +104,7 @@ #include "llfloatertopobjects.h" #include "llfloateruipreview.h" #include "llfloatervoiceeffect.h" -#include "llfloaterwater.h" #include "llfloaterwhitelistentry.h" -#include "llfloaterwindlight.h" #include "llfloaterwindowsize.h" #include "llfloaterworldmap.h" #include "llimfloatercontainer.h" @@ -184,12 +180,8 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>); - LLFloaterReg::add("env_day_cycle", "floater_day_cycle_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDayCycle>); LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>); - LLFloaterReg::add("old_env_settings", "floater_env_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvSettings>); LLFloaterReg::add("env_settings", "floater_environment_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvironmentSettings>); - LLFloaterReg::add("env_water", "floater_water.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWater>); - LLFloaterReg::add("env_windlight", "floater_windlight_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWindLight>); LLFloaterReg::add("env_delete_preset", "floater_delete_env_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeleteEnvPreset>); LLFloaterReg::add("env_edit_sky", "floater_edit_sky_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditSky>); LLFloaterReg::add("env_edit_water", "floater_edit_water_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditWater>); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index e8c91cd0f0..55eea8fc69 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7583,16 +7583,7 @@ class LLWorldEnvSettings : public view_listener_t bool handleEvent(const LLSD& userdata) { std::string tod = userdata.asString(); - LLVector3 sun_direction; - if (tod == "old_editor") - { - // if not there or is hidden, show it - // *TODO replace with LLFloaterWindLight::show(LLEnvKey::SCOPE_LOCAL) to make sure we're using the right scope? - LLFloaterReg::toggleInstance("old_env_settings"); - return true; - } - if (tod == "editor") { LLFloaterReg::toggleInstance("env_settings"); @@ -7685,16 +7676,6 @@ class LLWorldPostProcess : public view_listener_t } }; -/// Day Cycle callbacks -class LLWorldDayCycle : public view_listener_t -{ - bool handleEvent(const LLSD& userdata) - { - LLFloaterReg::showInstance("env_day_cycle"); - return true; - } -}; - class LLWorldToggleMovementControls : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -7925,7 +7906,6 @@ void initialize_menus() view_listener_t::addMenu(new LLWorldEnvSettings(), "World.EnvSettings"); view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset"); view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess"); - view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle"); view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls"); view_listener_t::addMenu(new LLWorldToggleCameraControls(), "World.Toggle.CameraControls"); diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 475f57cdd4..1a98d4c6c2 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -54,7 +54,6 @@ #include "llwlparammanager.h" #include "llwaterparamset.h" -#include "llfloaterwater.h" #include "curl/curl.h" @@ -225,13 +224,6 @@ void LLWaterParamManager::update(LLViewerCamera * cam) // update the shaders and the menu propagateParameters(); - // sync menus if they exist - LLFloaterWater* waterfloater = LLFloaterReg::findTypedInstance<LLFloaterWater>("env_water"); - if(waterfloater) - { - waterfloater->syncMenu(); - } - // only do this if we're dealing with shaders if(gPipeline.canUseVertexShaders()) { diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp index 488b189e94..39d366b023 100644 --- a/indra/newview/llwaterparamset.cpp +++ b/indra/newview/llwaterparamset.cpp @@ -29,7 +29,6 @@ #include "llwaterparamset.h" #include "llsd.h" -#include "llfloaterwater.h" #include "llwaterparammanager.h" #include "lluictrlfactory.h" #include "llsliderctrl.h" diff --git a/indra/newview/llwaterparamset.h b/indra/newview/llwaterparamset.h index 9957d5371b..b28585af59 100644 --- a/indra/newview/llwaterparamset.h +++ b/indra/newview/llwaterparamset.h @@ -34,7 +34,6 @@ #include "v4color.h" #include "llviewershadermgr.h" -class LLFloaterWater; class LLWaterParamSet; /// A class representing a set of parameter values for the Water shaders. diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index e646b605a9..4c0cb7c0f4 100644 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -29,7 +29,6 @@ #include "llwldaycycle.h" #include "llsdserialize.h" #include "llwlparammanager.h" -#include "llfloaterdaycycle.h" #include "llnotifications.h" #include "llviewerwindow.h" diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index b5eb62b0b0..213bc7c7ce 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -36,8 +36,6 @@ #include "llviewerprecompiledheaders.h" #include "llhttpclient.h" -class LLEnvManager; - class LLEnvironmentRequest { LOG_CLASS(LLEnvironmentRequest); @@ -59,7 +57,6 @@ public: private: friend class LLEnvironmentRequest; - friend class LLEnvManager; LLEnvironmentRequestResponder(); static int sCount; diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index f475b3da01..55608a059f 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -55,9 +55,6 @@ #include "llwlparamset.h" #include "llpostprocess.h" -#include "llfloaterwindlight.h" -#include "llfloaterdaycycle.h" -#include "llfloaterenvsettings.h" #include "llviewershadermgr.h" #include "llglslshader.h" @@ -457,23 +454,6 @@ void LLWLParamManager::update(LLViewerCamera * cam) // update the shaders and the menu propagateParameters(); - // sync menus if they exist - LLFloaterWindLight* wlfloater = LLFloaterReg::findTypedInstance<LLFloaterWindLight>("env_windlight"); - if (wlfloater) - { - wlfloater->syncMenu(); - } - LLFloaterDayCycle* dlfloater = LLFloaterReg::findTypedInstance<LLFloaterDayCycle>("env_day_cycle"); - if (dlfloater) - { - dlfloater->syncMenu(); - } - LLFloaterEnvSettings* envfloater = LLFloaterReg::findTypedInstance<LLFloaterEnvSettings>("old_env_settings"); - if (envfloater) - { - envfloater->syncMenu(); - } - F32 camYaw = cam->getYaw(); stop_glerror(); diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index a027d635e6..02d914a812 100644 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -29,7 +29,6 @@ #include "llwlparamset.h" #include "llwlanimator.h" -#include "llfloaterwindlight.h" #include "llwlparammanager.h" #include "llglslshader.h" #include "lluictrlfactory.h" diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h index 1358502032..3c44ed3bb8 100644 --- a/indra/newview/llwlparamset.h +++ b/indra/newview/llwlparamset.h @@ -33,7 +33,6 @@ #include "v4math.h" #include "v4color.h" -class LLFloaterWindLight; class LLWLParamSet; class LLGLSLShader; diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml deleted file mode 100644 index ffae3d788f..0000000000 --- a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="DAG CYKLUS OPSÆTNING"> - <tab_container name="Day Cycle Tabs"> - <panel label="Dag cyklus" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <multi_slider label="" name="WLTimeSlider"/> - <multi_slider label="" name="WLDayCycleKeys"/> - <text name="WL12am"> - 00:00 - </text> - <text name="WL3am"> - 03:00 - </text> - <text name="WL6am"> - 06:00 - </text> - <text name="WL9amHash"> - 09:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 00:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey"/> - <button label="Slet key" label_selected="Slet key" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Key-frame indstillinger: - </text> - <text name="WLCurKeyTimeText"> - Key tid: - </text> - <spinner label="Timer" name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key fast indstilling: - </text> - <combo_box label="Faste" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Cycluslængde: - </text> - <spinner label="Timer" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Sek." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vis : - </text> - <button label="Afspil" label_selected="Afspil" name="WLAnimSky"/> - <button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Benyt estate tid" label_selected="Gå til estate tid" name="WLUseLindenTime"/> - <button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle"/> - <button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_env_settings.xml b/indra/newview/skins/default/xui/da/floater_env_settings.xml deleted file mode 100644 index a6fbc05734..0000000000 --- a/indra/newview/skins/default/xui/da/floater_env_settings.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="REDIGERING AF OMGIVELSER"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Tid på -dagen - </text> - <text name="EnvTimeText2"> - 00:00 - </text> - <slider label="" name="EnvTimeSlider"/> - <text name="EnvCloudText"> - Skydække - </text> - <slider label="" name="EnvCloudSlider"/> - <text name="EnvWaterColorText"> - Farve på -vand - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Klik for at åbne farvevælger"/> - <text name="EnvWaterFogText"> - Tåge på -vand - </text> - <slider label="" name="EnvWaterFogSlider"/> - <button label="Benyt tid fra estate" name="EnvUseEstateTimeButton"/> - <button label="Avanceret himmel" name="EnvAdvancedSkyButton"/> - <button label="Avanceret vand" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_water.xml b/indra/newview/skins/default/xui/da/floater_water.xml deleted file mode 100644 index aedd1b442c..0000000000 --- a/indra/newview/skins/default/xui/da/floater_water.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="AVANCERET OPSÆTNING AF VAND"> - <text name="KeyFramePresetsText"> - Vand opsætninger: - </text> - <button label="Ny" label_selected="Ny" name="WaterNewPreset"/> - <button label="Gem" label_selected="Gem" name="WaterSavePreset"/> - <button label="Slet" label_selected="Slet" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="INDSTILLINGER" name="Settings"> - <text name="BHText"> - Vandtåge farve - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Klik for at åbne farvevælger"/> - <text name="WaterFogDensText"> - Tåge tæthedskarakteristik - </text> - <button label="?" name="WaterFogDensityHelp"/> - <slider label="" name="WaterFogDensity"/> - <text name="WaterUnderWaterFogModText"> - Tilretning undervandståge - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <slider label="" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Lille bølge reflektionsskala - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <slider label="" name="WaterNormalScaleX"/> - <slider label="" name="WaterNormalScaleY"/> - <slider label="" name="WaterNormalScaleZ"/> - <text name="HDText"> - Spredningsskala - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <slider label="" name="WaterFresnelScale"/> - <text name="FresnelOffsetText"> - Spredning offset - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <slider label="" name="WaterFresnelOffset"/> - <text name="DensMultText"> - Lysbrydning fra oven - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <slider label="" name="WaterScaleAbove"/> - <text name="WaterScaleBelowText"> - Lysbrydning fra neden - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <slider label="" name="WaterScaleBelow"/> - <text name="MaxAltText"> - Udviskning - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - <slider label="" name="WaterBlurMult"/> - </panel> - <panel label="BILLEDE" name="Waves"> - <text name="BHText"> - Retning for store bølger - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <slider label="" name="WaterWave1DirX"/> - <slider label="" name="WaterWave1DirY"/> - <text name="BHText2"> - Retning for små bølger - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <slider label="" name="WaterWave2DirX"/> - <slider label="" name="WaterWave2DirY"/> - <text name="BHText3"> - Tekstur map - </text> - <button label="?" name="WaterNormalMapHelp"/> - <texture_picker label="" name="WaterNormalMap"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/da/floater_windlight_options.xml b/indra/newview/skins/default/xui/da/floater_windlight_options.xml deleted file mode 100644 index 56f94b24e9..0000000000 --- a/indra/newview/skins/default/xui/da/floater_windlight_options.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="WindLight floater" title="AVANCERET OPSÆTNING FOR HIMMEL"> - <text name="KeyFramePresetsText"> - Faste indstillinger: - </text> - <button label="Ny" label_selected="Ny" name="WLNewPreset" /> - <button label="Gem" label_selected="Gem" name="WLSavePreset" /> - <button label="Slet" label_selected="Slet" name="WLDeletePreset" /> - <button label="Dags cyklus" label_selected="Dags cyklus" name="WLDayCycleMenuButton" /> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFÆRE" name="Atmosphere"> - <text name="BHText"> - Blå - horisont - </text> - <button label="?" name="WLBlueHorizonHelp" /> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <slider label="" name="WLBlueHorizonR" /> - <slider label="" name="WLBlueHorizonG" /> - <slider label="" name="WLBlueHorizonB" /> - <slider label="" name="WLBlueHorizonI" /> - <text name="BDensText"> - Dis - horisont - </text> - <button label="?" name="WLHazeHorizonHelp" /> - <slider label="" name="WLHazeHorizon" /> - <text name="BDensText2"> - Blå - tæthed - </text> - <button label="?" name="WLBlueDensityHelp" /> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <slider label="" name="WLBlueDensityR" /> - <slider label="" name="WLBlueDensityG" /> - <slider label="" name="WLBlueDensityB" /> - <slider label="" name="WLBlueDensityI" /> - <text name="HDText"> - Dis - intensitet - </text> - <button label="?" name="WLHazeDensityHelp" /> - <slider label="" name="WLHazeDensity" /> - <text name="DensMultText"> - Densitet faktor - </text> - <button label="?" name="WLDensityMultHelp" /> - <slider label="" name="WLDensityMult" /> - <text name="WLDistanceMultText"> - Distance faktor - </text> - <button label="?" name="WLDistanceMultHelp" /> - <slider label="" name="WLDistanceMult" /> - <text name="MaxAltText"> - Maximum højde - </text> - <button label="?" name="WLMaxAltitudeHelp" /> - <slider label="" name="WLMaxAltitude" /> - </panel> - <panel label="LYS" name="Lighting"> - <text name="SLCText"> - Sol/Måne farve - </text> - <button label="?" name="WLSunlightColorHelp" /> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLSunlightR" /> - <slider label="" name="WLSunlightG" /> - <slider label="" name="WLSunlightB" /> - <slider label="" name="WLSunlightI" /> - <text name="TODText"> - Sol/Måne position - </text> - <button label="?" name="WLTimeOfDayHelp" /> - <slider label="" name="WLSunAngle" /> - <text name="WLAmbientText"> - Omgivende - </text> - <button label="?" name="WLAmbientHelp" /> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <slider label="" name="WLAmbientR" /> - <slider label="" name="WLAmbientG" /> - <slider label="" name="WLAmbientB" /> - <slider label="" name="WLAmbientI" /> - <text name="WLEastAngleText"> - Øst vinkel - </text> - <button label="?" name="WLEastAngleHelp" /> - <slider label="" name="WLEastAngle" /> - <text name="SunGlowText"> - Sol glød - </text> - <button label="?" name="WLSunGlowHelp" /> - <slider label="Fokus " name="WLGlowB" /> - <slider label="Størr. " name="WLGlowR" /> - <text name="SceneGammaText"> - Lysintensitet (gamma) - </text> - <button label="?" name="WLSceneGammaHelp" /> - <slider label="" name="WLGamma" /> - <text name="WLStarText"> - Stjerne intensitet - </text> - <button label="?" name="WLStarBrightnessHelp" /> - <slider label="" name="WLStarAlpha" /> - </panel> - <panel label="SKYER" name="Clouds"> - <text name="WLCloudColorText"> - Farve på skyer - </text> - <button label="?" name="WLCloudColorHelp" /> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLCloudColorR" /> - <slider label="" name="WLCloudColorG" /> - <slider label="" name="WLCloudColorB" /> - <slider label="" name="WLCloudColorI" /> - <text name="WLCloudColorText2"> - Skyer XY/Tæthed - </text> - <button label="?" name="WLCloudDensityHelp" /> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - T - </text> - <slider label="" name="WLCloudX" /> - <slider label="" name="WLCloudY" /> - <slider label="" name="WLCloudDensity" /> - <text name="WLCloudCoverageText"> - Skydække - </text> - <button label="?" name="WLCloudCoverageHelp" /> - <slider label="" name="WLCloudCoverage" /> - <text name="WLCloudScaleText"> - Skystørrelse - </text> - <button label="?" name="WLCloudScaleHelp" /> - <slider label="" name="WLCloudScale" /> - <text name="WLCloudDetailText"> - Sky detaljer(XY/tæthed) - </text> - <button label="?" name="WLCloudDetailHelp" /> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - T - </text> - <slider label="" name="WLCloudDetailX" /> - <slider label="" name="WLCloudDetailY" /> - <slider label="" name="WLCloudDetailDensity" /> - <text name="WLCloudScrollXText"> - Sky drift X - </text> - <button label="?" name="WLCloudScrollXHelp" /> - <check_box label="Lås" name="WLCloudLockX" /> - <slider label="" name="WLCloudScrollX" /> - <text name="WLCloudScrollYText"> - Sky drift Y - </text> - <button label="?" name="WLCloudScrollYHelp" /> - <check_box label="Lås" name="WLCloudLockY" /> - <slider label="" name="WLCloudScrollY" /> - <check_box label="Benyt simple skyer" name="DrawClassicClouds" /> - <button label="?" name="WLClassicCloudsHelp" /> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml deleted file mode 100644 index 8599737106..0000000000 --- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="TAGESZYKLUS-EDITOR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Tageszyklus" name="Day Cycle"> - <button label=" ?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 24:00 - </text> - <text name="WL3am"> - 03:00 - </text> - <text name="WL6am"> - 06:00 - </text> - <text name="WL9amHash"> - 09:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey"/> - <button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Keyframe-Einstellungen: - </text> - <text name="WLCurKeyTimeText"> - Key-Zeit: - </text> - <spinner label="Std." name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key-Voreinstellung: - </text> - <combo_box label="Voreinstellung" name="WLKeyPresets"/> - <text name="DayCycleText"> - Einrasten: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Zykluslänge: - </text> - <spinner label="Std." name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Sek." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vorschau: - </text> - <button label="Start" label_selected="Start" name="WLAnimSky"/> - <button label="Stopp" label_selected="Stopp" name="WLStopAnimSky"/> - <button label="Grundbesitzzeit verw" label_selected="Zur Grundbesitzzeit" name="WLUseLindenTime"/> - <button label="Testtag speichern" label_selected="Testtag speichern" name="WLSaveDayCycle"/> - <button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml deleted file mode 100644 index 0c78909108..0000000000 --- a/indra/newview/skins/default/xui/de/floater_env_settings.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="UMWELT-EDITOR"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Tageszeit - </text> - <text name="EnvTimeText2"> - 12:00 - </text> - <text name="EnvCloudText"> - Wolkendecke - </text> - <text name="EnvWaterColorText"> - Wasserfarbe - </text> - <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <text name="EnvWaterFogText"> - Wasser- -trübung - </text> - <button label="Grundbesitzzeit verw." name="EnvUseEstateTimeButton"/> - <button label="Himmel (erweitert)" name="EnvAdvancedSkyButton"/> - <button label="Wasser (erweitert)" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml deleted file mode 100644 index bb0dd9c75d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_water.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ERWEITERTER WASSER-EDITOR"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText" width="110"> - Voreinstellungen: - </text> - <combo_box left_delta="110" name="WaterPresetsCombo"/> - <button label="Neu" label_selected="Neu" name="WaterNewPreset"/> - <button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/> - <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="EINSTELLUNGEN" name="Settings"> - <text name="BHText"> - Wassertrübungsfarbe - </text> - <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/> - <text name="WaterFogDensText"> - Wassertrübungsdichte - </text> - <text name="WaterUnderWaterFogModText"> - Wassertrübungs-Modifikator - </text> - <slider bottom_delta="-34" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Reflexionswellengröße - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Fresnel-Skalierung - </text> - <text name="FresnelOffsetText"> - Fresnel-Versatz - </text> - <text name="DensMultText"> - Brechungsstärke oben - </text> - <text name="WaterScaleBelowText"> - Brechungsstärke unten - </text> - <text name="MaxAltText"> - Mischungsmultiplikator - </text> - </panel> - <panel label="BILD" name="Waves"> - <text name="BHText"> - Richtung große Welle - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Richtung kleine Welle - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normal-Map - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml deleted file mode 100644 index 5b59336f9d..0000000000 --- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ERWEITERTER HIMMEL-EDITOR"> - <text name="KeyFramePresetsText"> - Voreinstellungen: - </text> - <button label="Neu" label_selected="Neu" name="WLNewPreset"/> - <button label="Speichern" label_selected="Speichern" name="WLSavePreset"/> - <button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/> - <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSPHÄRE" name="Atmosphere"> - <text name="BHText"> - Horizontfarbe - </text> - <button label=" ?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Horizonttrübung - </text> - <button label=" ?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Farbintensität - </text> - <button label=" ?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Trübungsintensität - </text> - <button label=" ?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Dichtemultiplikator - </text> - <button label=" ?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Entfernungsmultiplikator - </text> - <button label=" ?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Max. Höhe - </text> - <button label=" ?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LICHT" name="Lighting"> - <text name="SLCText"> - Sonne/Mond-Farbe - </text> - <button label=" ?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Sonne/Mond-Stand - </text> - <button label=" ?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Umgebung - </text> - <button label=" ?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ostausrichtung - </text> - <button label=" ?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Sonnenleuchtkraft - </text> - <button label=" ?" name="WLSunGlowHelp"/> - <slider label="Fokus " name="WLGlowB"/> - <slider label="Größe " name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma in Szene - </text> - <button label=" ?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Sternenleuchtkraft - </text> - <button label=" ?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="WOLKEN" name="Clouds"> - <text name="WLCloudColorText"> - Wolkenfarbe - </text> - <button label=" ?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Wolken-XY/Dichte - </text> - <button label=" ?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Wolkendichte - </text> - <button label=" ?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Wolkenskalierung - </text> - <button label=" ?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Wolkendetails (XY/Dichte) - </text> - <button label=" ?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Wolkenbewegung X - </text> - <button label=" ?" name="WLCloudScrollXHelp"/> - <check_box label="Fest" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Wolkenbewegung Y - </text> - <button label=" ?" name="WLCloudScrollYHelp"/> - <check_box label="Fest" name="WLCloudLockY"/> - <check_box label="Klassische Wolken" name="DrawClassicClouds"/> - <button label=" ?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml deleted file mode 100644 index 59cdb295ef..0000000000 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ /dev/null @@ -1,416 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="275" - layout="topleft" - name="Day Cycle Floater" - help_topic="day_cycle_floater" - save_rect="true" - title="DAY CYCLE EDITOR" - width="658"> - <tab_container - follows="left|top" - height="255" - layout="topleft" - left="0" - name="Day Cycle Tabs" - tab_position="top" - top="20" - width="656"> - <panel - border="true" - follows="left|top|right|bottom" - height="255" - label="Day Cycle" - layout="topleft" - left="1" - mouse_opaque="false" - name="Day Cycle" - top="0" - width="654"> - <multi_slider - can_edit_text="true" - control_name="WLTimeSlider" - decimal_digits="0" - draw_track="false" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left="20" - max_sliders="20" - max_val="24" - name="WLTimeSlider" - show_text="false" - top="25" - use_triangle="true" - width="525" /> - <multi_slider - can_edit_text="true" - control_name="WLDayCycleKeys" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="20" - max_val="24" - name="WLDayCycleKeys" - show_text="false" - top_pad="15" - width="525" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left="8" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3am" - top_delta="0" - width="55"> - 3am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9amHash" - top_delta="0" - width="55"> - 9am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3pm" - top_delta="0" - width="55"> - 3pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9pm" - top_delta="0" - width="55"> - 9pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left="20" - name="WL12amHash" - top="54" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3amHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6amHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9amHash2" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12pmHash2" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6pmHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12amHash2" - top_delta="-3" - width="6"> - | - </text> - <button - height="20" - label="Add Key" - label_selected="Add Key" - layout="topleft" - left="555" - name="WLAddKey" - top="30" - width="96" /> - <button - height="20" - label="Delete Key" - label_selected="Delete Key" - layout="topleft" - left_delta="0" - name="WLDeleteKey" - top_pad="5" - width="96" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="20" - name="WLCurKeyFrameText" - top="104" - width="235"> - Key Frame Settings: - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText" - top="124" - width="105"> - Key Time: - </text> - <spinner - control_name="WLCurKeyHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="35" - layout="topleft" - left_delta="20" - max_val="23" - name="WLCurKeyHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLCurKeyMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="5" - initial_value="0" - label="Min" - label_width="45" - layout="topleft" - left_pad="5" - max_val="55" - name="WLCurKeyMin" - top_delta="0" - width="85" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText2" - top="169" - width="185"> - Key Preset: - </text> - <combo_box - height="18" - label="Preset" - layout="topleft" - left_delta="0" - name="WLKeyPresets" - top_pad="7" - width="205" /> - <view_border - bevel_style="none" - follows="top|left" - height="115" - layout="topleft" - left="12" - top="101" - width="240" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml deleted file mode 100644 index e6cf433c8d..0000000000 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="150" - layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" - save_rect="true" - title="ENVIRONMENT EDITOR" - width="600"> - <floater.string - name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvTimeText" - top="32" - width="140"> - Time of Day - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="15" - name="EnvTimeText2" - top="62" - width="140"> - 12:00 PM - </text> - <icon - height="25" - image_name="icon_diurnal.tga" - layout="topleft" - left="85" - name="EnvDayCycle" - top="30" - use_draw_context_alpha="false" - width="200" /> - <slider - control_name="EnvTimeSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.0069444" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="0.99" - name="EnvTimeSlider" - show_text="false" - top_pad="10" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvCloudText" - top="86" - width="140"> - Cloud Cover - </text> - <slider - control_name="EnvCloudSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="75" - name="EnvCloudSlider" - top_delta="4" - width="210" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterColorText" - top="39" - width="140"> - Water Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="390" - name="EnvWaterColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterFogText" - top="86" - width="140"> - Water Fog - </text> - <slider - control_name="EnvWaterFogSlider" - decimal_digits="2" - follows="left" - height="10" - initial_value="0" - layout="topleft" - left_delta="75" - max_val="10" - name="EnvWaterFogSlider" - top_delta="4" - width="210" /> - <button - follows="left|top" - height="23" - label="Use Estate Time" - layout="topleft" - left="10" - name="EnvUseEstateTimeButton" - top_pad="20" - width="137" /> - <button - follows="left|top" - height="23" - label="Use Local Time" - left_pad="5" - name="EnvUseLocalTimeButton" - top_delta="0" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Sky" - layout="topleft" - left_pad="3" - name="EnvAdvancedSkyButton" - top_delta="0" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Water" - layout="topleft" - left_pad="3" - name="EnvAdvancedWaterButton" - top_delta="0" - width="137" /> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml deleted file mode 100644 index 3a44ba3763..0000000000 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ /dev/null @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="240" - layout="topleft" - name="Water Floater" - help_topic="water_floater" - save_rect="true" - title="ADVANCED WATER EDITOR" - width="700"> - <floater.string - name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - font="SansSerif" - width="85"> - Water Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="95" - name="WaterPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WaterNewPreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WaterSavePreset" - top_delta="0" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WaterDeletePreset" - top_delta="0" - width="70" /> - <tab_container - border="false" - follows="left|top" - height="180" - halign="center" - layout="topleft" - left="0" - name="Water Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="all" - height="180" - label="SETTINGS" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_settings_tab" - name="Settings" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Water Fog Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="40" - name="WaterFogColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WaterFogDensText" - top="84" - width="200"> - Fog Density Exponent - </text> - <slider - control_name="WaterFogDensity" - decimal_digits="1" - follows="left" - height="10" - initial_value="16" - layout="topleft" - left="24" - max_val="10" - name="WaterFogDensity" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterUnderWaterFogModText" - top="124" - width="200"> - Underwater Fog Modifier - </text> - <slider - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="16" - layout="topleft" - left="24" - max_val="2" - name="WaterUnderWaterFogMod" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText" - top="4" - width="200"> - Reflection Wavelet Scale - </text> - <slider - control_name="WaterNormalScaleX" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="1" - layout="topleft" - max_val="10" - name="WaterNormalScaleX" - top_pad="24" - width="200" /> - <slider - control_name="WaterNormalScaleY" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="2" - layout="topleft" - max_val="10" - name="WaterNormalScaleY" - top_pad="4" - width="200" /> - <slider - control_name="WaterNormalScaleZ" - decimal_digits="1" - follows="left" - height="15" - initial_value="0.7" - label="3" - layout="topleft" - max_val="10" - name="WaterNormalScaleZ" - top_pad="4" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="HDText" - top="84" - width="200"> - Fresnel Scale - </text> - <slider - control_name="WaterFresnelScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelScale" - top="124" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - name="FresnelOffsetText" - top="124" - width="200"> - Fresnel Offset - </text> - <slider - control_name="WaterFresnelOffset" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WaterFresnelOffset" - top="164" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="200"> - Refract Scale Above - </text> - <slider - control_name="WaterScaleAbove" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left="494" - name="WaterScaleAbove" - top="44" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WaterScaleBelowText" - top="44" - width="200"> - Refract Scale Below - </text> - <slider - control_name="WaterScaleBelow" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left="494" - name="WaterScaleBelow" - top="84" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="MaxAltText" - top="84" - width="200"> - Blur Multiplier - </text> - <slider - control_name="WaterBlurMult" - follows="left" - height="10" - increment="0.001" - initial_value="0" - layout="topleft" - left="494" - max_val="0.16" - name="WaterBlurMult" - top="124" - width="200" /> - </panel> - <panel - border="true" - follows="all" - height="180" - label="IMAGE" - layout="topleft" - left="0" - mouse_opaque="false" - help_topic="water_waves_tab" - name="Waves" - top="0" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="200"> - Big Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="WaterWave1DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave1DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave1DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave1DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave1DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave1DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-10" - width="355"> - Little Wave Direction - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - left_delta="0" - name="WaterWave2DirXText" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WaterWave2DirX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - max_val="4" - min_val="-4" - name="WaterWave2DirX" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="WaterWave2DirYText" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WaterWave2DirY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="4" - min_val="-4" - name="WaterWave2DirY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="240" - name="BHText3" - top="4" - width="200"> - Normal Map - </text> - <texture_picker - height="143" - layout="topleft" - left="250" - name="WaterNormalMap" - top="22" - width="128" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml deleted file mode 100644 index 9fbb784c76..0000000000 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ /dev/null @@ -1,1278 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="256" - layout="topleft" - name="WindLight floater" - help_topic="windlight_floater" - save_rect="true" - title="ADVANCED SKY EDITOR" - width="700"> - <floater.string - name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - width="135"> - Sky Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="135" - name="WLPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WLNewPreset" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WLSavePreset" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WLDeletePreset" - width="70" /> - <button - height="23" - label="Day Cycle Editor" - label_selected="Day Cycle Editor" - layout="topleft" - right="-10" - name="WLDayCycleMenuButton" - top_pad="-23" - width="120" /> - <tab_container - follows="left|top" - height="196" - halign="center" - layout="topleft" - left="0" - name="WindLight Tabs" - tab_position="top" - top="60" - width="700"> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="ATMOSPHERE" - layout="topleft" - left="1" - mouse_opaque="false" - help_topic="windlight_atmosphere_tab" - name="Atmosphere" - top="60" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="355"> - Blue Horizon - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="BHText2" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueHorizonR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - top_pad="-15" - name="BHText3" - width="10"> - G - </text> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText4" - left="10" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WLBlueHorizonB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText5" - left="10" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueHorizonI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - name="WLBlueHorizonI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - top_pad="-10" - name="BDensText" - width="355"> - Haze Horizon - </text> - <slider - control_name="WLHazeHorizon" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - layout="topleft" - left="23" - top_delta="0" - top_pad="27" - name="WLHazeHorizon" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText2" - top="4" - width="355"> - Blue Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText6" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueDensityR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText7" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLBlueDensityG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText8" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueDensityB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText9" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLBlueDensityI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="HDText" - top_pad="-10" - width="355"> - Haze Density - </text> - <slider - control_name="WLHazeDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="258" - max_val="4" - name="WLHazeDensity" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="355"> - Density Multiplier - </text> - <slider - control_name="WLDensityMult" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="13" - max_val="0.9" - name="WLDensityMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLDistanceMultText" - top_pad="-10" - width="355"> - Distance Multiplier - </text> - <slider - control_name="WLDistancMult" - decimal_digits="1" - follows="left" - height="10" - initial_value="1.0" - layout="topleft" - left_delta="13" - max_val="100" - name="WLDistanceMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="MaxAltText" - top_pad="-15" - width="355"> - Max Altitude - </text> - <slider - control_name="WLMaxAltitude" - decimal_digits="0" - follows="left" - height="10" - increment="1" - initial_value="500" - layout="topleft" - left_delta="13" - max_val="4000" - name="WLMaxAltitude" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="LIGHTING" - layout="topleft" - left_delta="0" - help_topic="windlight_lighting_tab" - name="Lighting" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="SLCText" - top="4" - width="355"> - Sun/Moon Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLSunlightR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLSunlightG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLSunlightB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLSunlightI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLSunlightI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="TODText" - top_pad="-10" - width="355"> - Sun/Moon Position - </text> - <icon - height="20" - image_name="icon_diurnal.tga" - layout="topleft" - left_delta="14" - top_pad="10" - name="SkyDayCycle" - use_draw_context_alpha="false" - width="148" /> - <slider - control_name="WLSunAngle" - follows="left" - height="10" - increment="0.001" - initial_value="0.7" - layout="topleft" - left_delta="-8" - name="WLSunAngle" - top_pad="20" - width="207" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLAmbientText" - top="4" - width="355"> - Ambient - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLAmbientR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLAmbientG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLAmbientB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText8" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLAmbientI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLAmbientI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLEastAngleText" - top_pad="-10" - width="355"> - East Angle - </text> - <slider - control_name="WLEastAngle" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.0" - layout="topleft" - left_delta="13" - name="WLEastAngle" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="SunGlowText" - top="4" - width="355"> - Sun Glow - </text> - <slider - control_name="WLGlowB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - label="Focus " - layout="topleft" - left_delta="0" - max_val="0.5" - name="WLGlowB" - top_pad="27" - width="200" /> - <slider - control_name="WLGlowR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - label="Size " - layout="topleft" - left_delta="0" - max_val="1.99" - min_val="1" - name="WLGlowR" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="SceneGammaText" - top_pad="-10" - width="200"> - Scene Gamma - </text> - <slider - control_name="WLGamma" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="2.0" - layout="topleft" - left_delta="0" - max_val="10" - name="WLGamma" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="WLStarText" - top_pad="-10" - width="355"> - Star Brightness - </text> - <slider - control_name="WLStarAlpha" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="2" - name="WLStarAlpha" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="CLOUDS" - layout="topleft" - left_delta="0" - mouse_opaque="false" - help_topic="windlight_clouds_tab" - name="Clouds" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WLCloudColorText" - top="4" - width="355"> - Cloud Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudColorR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLCloudColorG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLCloudColorB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLCloudColorI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudColorI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudColorText2" - top_pad="-10" - width="355"> - Cloud XY/Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudY" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLCloudCoverageText" - top="4" - width="355"> - Cloud Coverage - </text> - <slider - control_name="WLCloudCoverage" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="13" - name="WLCloudCoverage" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudScaleText" - top_pad="-10" - width="355"> - Cloud Scale - </text> - <slider - control_name="WLCloudScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="13" - min_val="0.01" - name="WLCloudScale" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudDetailText" - top_pad="-10" - width="355"> - Cloud Detail (XY/Density) - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_pad="8" - width="10"> - X - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="8" - name="WLCloudDetailX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText9" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudDetailY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudDetailY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText10" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDetailDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="WLCloudScrollXText" - top="4" - width="355"> - Cloud Scroll X - </text> - <check_box - control_name="WLCloudLockX" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockX" - width="200" /> - <slider - control_name="WLCloudScrollX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollX" - top="45" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WLCloudScrollYText" - top_delta="-1" - width="355"> - Cloud Scroll Y - </text> - <check_box - control_name="WLCloudLockY" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockY" - width="200" /> - <slider - control_name="WLCloudScrollY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollY" - top="85" - width="200" /> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 60ab4d2bc5..4ef64269e8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4854,18 +4854,6 @@ Do you wish to overwrite the saved preset? <notification icon="alertmodal.tga" - name="WLDeletePresetAlert" - type="alertmodal"> -Do you wish to delete [SKY]? - <tag>confirm</tag> - <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> - </notification> - - <notification - icon="alertmodal.tga" name="WLNoEditDefault" type="alertmodal"> You cannot edit or delete a default preset. @@ -4890,40 +4878,6 @@ Sorry, the settings couldn't be applied to the region. Leaving the region and t <notification functor="GenericAcknowledge" icon="alertmodal.tga" - name="EnvEditExternalCancel" - type="alertmodal"> -Warning: an update to the environment settings you were just editing was received, either because settings you recently committed have just been applied or because someone else with editing permissions updated the region's environment settings. In order to avoid overwriting this update, your changes have been cancelled; concurrent edits are not permitted. Please try again. - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - functor="GenericAlertYesCancel" - icon="alertmodal.tga" - name="EnvEditUnsavedChangesCancel" - type="alertmodal"> -Warning: you have un-applied changes to the following environment settings: [SCOPE]. Are you sure you want to cancel them? - <usetemplate - name="okcancelbuttons" - yestext="Cancel Changes" - notext="Resume Editing"/> - </notification> - - <notification - functor="GenericAcknowledge" - icon="alertmodal.tga" - name="EnvOtherScopeAlreadyOpen" - type="alertmodal"> -You cannot modify your local environment settings and region environment settings at the same time. Close the environment settings windows currently open and try again. - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - functor="GenericAcknowledge" - icon="alertmodal.tga" name="EnvCannotDeleteLastDayCycleKey" type="alertmodal"> Unable to delete the last key in this day cycle because you cannot have an empty day cycle. You should modify the last remaining key instead of attempting to delete it and then to create a new one. @@ -4966,74 +4920,6 @@ PostProcess Effect exists. Do you still wish overwrite it? </notification> <notification - icon="alert.tga" - name="NewSkyPreset" - type="alert"> -Give me a name for the new sky. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> - </notification> - - <notification - icon="alertmodal.tga" - name="ExistsSkyPresetAlert" - type="alertmodal"> -Preset already exists! - <tag>fail</tag> - </notification> - - <notification - icon="alert.tga" - name="NewWaterPreset" - type="alert"> -Give me a name for the new water preset. - <tag>confirm</tag> - <form name="form"> - <input name="message" type="text"> -New Preset - </input> - <button - default="true" - index="0" - name="OK" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> - </notification> - - <notification - icon="alertmodal.tga" - name="ExistsWaterPresetAlert" - type="alertmodal"> -Preset already exists! - <tag>fail</tag> - </notification> - - <notification - icon="alertmodal.tga" - name="WaterNoEditDefault" - type="alertmodal"> -You cannot edit or delete a default preset. - <tag>fail</tag> - </notification> - - <notification icon="alertmodal.tga" name="ChatterBoxSessionStartError" type="alertmodal"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f1468797c1..09bff0a46c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2358,8 +2358,6 @@ Returns a string with the requested data about the region <!-- Environment settings --> <string name="LocalSettings">Local Settings</string> <string name="RegionSettings">Region Settings</string> - <string name="Local">Local</string> - <string name="Region">Region</string> <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml deleted file mode 100644 index 9c3ac1be0e..0000000000 --- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DEL CICLO DE UN DÍA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo de un día" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 12 am - </text> - <text name="WL3am"> - 3 am - </text> - <text name="WL6am"> - 6 am - </text> - <text name="WL9amHash"> - 9 am - </text> - <text name="WL12pmHash"> - 12 pm - </text> - <text name="WL3pm"> - 3 pm - </text> - <text name="WL6pm"> - 6 pm - </text> - <text name="WL9pm"> - 9 pm - </text> - <text name="WL12am2"> - 12 am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/> - <button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Configuración del fotograma clave: - </text> - <text name="WLCurKeyTimeText"> - Hora clave: - </text> - <spinner label="Hora" name="WLCurKeyHour"/> - <spinner label="Min." name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Modelo predefinido: - </text> - <combo_box label="Predefinido" name="WLKeyPresets"/> - <text name="DayCycleText"> - Intervalo: - </text> - <combo_box label="5 min." name="WLSnapOptions"/> - <text name="DayCycleText2"> - Duración del ciclo: - </text> - <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Seg." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Vista previa: - </text> - <button label="Probar" label_selected="Probar" name="WLAnimSky"/> - <button label="Parar" label_selected="Parar" name="WLStopAnimSky"/> - <button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/> - <button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/> - <button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml deleted file mode 100644 index 195690f546..0000000000 --- a/indra/newview/skins/default/xui/es/floater_env_settings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DEL ENTORNO"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Duración de -un día - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Nubosidad - </text> - <text name="EnvWaterColorText"> - Color del -agua - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el selector de color"/> - <text name="EnvWaterFogText"> - Claridad del -agua - </text> - <button bottom="-144" label="Usar el horario del estado" name="EnvUseEstateTimeButton" width="155"/> - <button label="Cielo avanzado" left="167" name="EnvAdvancedSkyButton" width="155"/> - <button label="Agua avanzada" left="326" name="EnvAdvancedWaterButton" width="155"/> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml deleted file mode 100644 index 2c1f6cfbfb..0000000000 --- a/indra/newview/skins/default/xui/es/floater_water.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR AVANZADO DEL AGUA"> - <text name="KeyFramePresetsText"> - Agua predefinida: - </text> - <button label="Nueva" label_selected="Nueva" name="WaterNewPreset"/> - <button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/> - <button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="CONFIGURACIÓN" name="Settings"> - <text name="BHText"> - Color del agua - </text> - <button label="?" left="175" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/> - <text name="WaterFogDensText"> - Transparencia - </text> - <button label="?" left="175" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Modificar la claridad del agua - </text> - <button label="?" left="175" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Tamaño de las ondulaciones - </text> - <button label="?" left="405" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Escala de Fresnel - </text> - <button label="?" left="405" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Coeficiente de reflexión - </text> - <button label="?" left="405" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refracción de la superficie - </text> - <button label="?" left="640" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refracción bajo la superficie - </text> - <button label="?" left="640" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Desenfoque - </text> - <button label="?" left="640" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMAGEN" name="Waves"> - <text name="BHText"> - Sentido de la onda grande - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Sentido de la onda pequeña - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Vista Normal - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml deleted file mode 100644 index 585a42e429..0000000000 --- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR AVANZADO DEL CIELO"> - <text name="KeyFramePresetsText"> - Cielos definidos: - </text> - <button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/> - <button label="Guardar" label_selected="Guardar" name="WLSavePreset"/> - <button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/> - <button font="SansSerifSmall" label="Editor del ciclo de un día" label_selected="Editor del ciclo de un día" left_delta="90" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMÓSFERA" name="Atmosphere"> - <text name="BHText"> - Coloración - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - V - </text> - <text name="BHText4"> - A - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Cantidad de bruma - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Saturación - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - V - </text> - <text name="BHText8"> - A - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densidad de la bruma - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Densidad - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Distancia - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitud máx. - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LUZ" name="Lighting"> - <text name="SLCText"> - Color del Sol y de la Luna - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - A - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posición del Sol y la Luna - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiental - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - V - </text> - <text name="BHText7"> - A - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ángulo de elevación - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Resplandor del Sol - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Visión" name="WLGlowB"/> - <slider label="Tamaño" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma de la escena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Brillo de las estrellas - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUBES" name="Clouds"> - <text name="WLCloudColorText"> - Color de las nubes - </text> - <button label="?" left="190" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - A - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Posición/Densidad de las nubes - </text> - <button label="?" left="190" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Nubosidad - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitud de las nubes - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text font="SansSerifSmall" name="WLCloudDetailText"> - Detalle de las nubes (Posición/Densidad) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text bottom="-113" name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <slider bottom="-127" name="WLCloudDetailX"/> - <text name="WLCloudScrollXText"> - Velocidad de X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Bloquear" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Velocidad de Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Bloquear" name="WLCloudLockY"/> - <check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/> - <button label="?" left="618" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml deleted file mode 100644 index 0ce17b9dc6..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITEUR DU CYCLE DU JOUR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Cycle du jour" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - Min. - </text> - <text name="WL3am"> - 3h - </text> - <text name="WL6am"> - 6h - </text> - <text name="WL9amHash"> - 9h - </text> - <text name="WL12pmHash"> - Midi - </text> - <text name="WL3pm"> - 15h - </text> - <text name="WL6pm"> - 18h - </text> - <text name="WL9pm"> - 21h - </text> - <text name="WL12am2"> - Min. - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/> - <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Réglages des images-clés : - </text> - <text name="WLCurKeyTimeText"> - Heure de la clé : - </text> - <spinner label="Heure" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Préréglages clés : - </text> - <combo_box label="Préréglage" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap : - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Durée du cycle : - </text> - <spinner label="Heure" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Aperçu : - </text> - <button label="Lire" label_selected="Lire" name="WLAnimSky"/> - <button label="Arrêter" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Utiliser heure domaine" label_selected="Aller heure domaine" name="WLUseLindenTime"/> - <button label="Enregistrer jour test" label_selected="Enregistrer jour test" name="WLSaveDayCycle"/> - <button label="Charger jour test" label_selected="Charger jour test" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml deleted file mode 100644 index dd714e85b6..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="ÉDITEUR D'ENVIRONNEMENT"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text bottom="-45" name="EnvTimeText" top="29"> - Heure de la -journée - </text> - <text bottom_delta="-36" name="EnvTimeText2"> - Midi - </text> - <text name="EnvCloudText"> - Couverture -nuageuse - </text> - <text bottom="-45" name="EnvWaterColorText" top="29"> - Couleur de -l'eau - </text> - <color_swatch name="EnvWaterColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> - <text name="EnvWaterFogText"> - Brouillard -dans l'eau - </text> - <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/> - <button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/> - <button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml deleted file mode 100644 index 7d1e3cd65c..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ÉDITEUR D'EAU AVANCÉ"> - <floater.string name="WLDefaultWaterNames"> - Valeur par défaut:Transparente:Bassin:Trouble:Première plaie:SERPENT !!!:Valdez - </floater.string> - <text name="KeyFramePresetsText" width="120"> - Préréglages : - </text> - <button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset"/> - <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/> - <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="PARAMÈTRES" name="Settings"> - <text name="BHText"> - Couleur du brouillard dans l'eau - </text> - <color_swatch left="75" name="WaterFogColor" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> - <text name="WaterFogDensText"> - Densité du brouillard - </text> - <text name="WaterUnderWaterFogModText"> - Brouillard sous-marin - </text> - <text name="BDensText"> - Échelle des vaguelettes - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Échelle Fresnel - </text> - <text name="FresnelOffsetText"> - Décalage Fresnel - </text> - <text name="DensMultText"> - Réfraction au-dessus - </text> - <text name="WaterScaleBelowText"> - Réfraction en dessous - </text> - <text name="MaxAltText"> - Multiplicateur de flou - </text> - </panel> - <panel label="IMAGE" name="Waves"> - <text name="BHText"> - Direction grande vague - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direction petite vague - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normal Map - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml deleted file mode 100644 index 657e5f5051..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ÉDITEUR DE CIEL AVANCÉ" width="706"> - <text name="KeyFramePresetsText"> - Préréglages : - </text> - <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/> - <button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/> - <button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/> - <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs" width="706"> - <panel label="ATMOSPHÈRE" name="Atmosphere"> - <text name="BHText"> - Bleu de l'horizon - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - V - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Quantité de brume - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densité du bleu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - V - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densité de la brume - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Multiplicateur de densité - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Multiplicateur de distance - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitude maximum - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="LUMIÈRE" name="Lighting"> - <text name="SLCText"> - Couleur soleil/lune - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Position soleil/lune - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Éclairage ambiant - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - V - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Angle du levant - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Rayonnement du soleil - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Netteté " name="WLGlowB"/> - <slider label="Taille " name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma de la scène - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Éclat des étoiles - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUAGES" name="Clouds"> - <text name="WLCloudColorText"> - Couleur des nuages - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - V - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Nuages XY/densité - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Couverture nuageuse - </text> - <button label="?" left="407" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitude des nuages - </text> - <button label="?" left="407" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Détails nuages (XY/densité) - </text> - <button bottom_delta="-2" label="?" left="407" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Direction et vitesse X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Verrouiller" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Direction et vitesse Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Verrouiller" name="WLCloudLockY"/> - <check_box label="Nuages classiques" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-Minuit:A-Midi:A-3h:A-15h:A-16h30:A-6h:A-18h:A-9h:A-21h:Barcelone:Blizzard:Bleu mi-journée:Après-midi sur la côte:Coucher de soleil (côte):Valeur par défaut:Coucher de soleil (désert):Belle journée:Gros nuages floconneux:Brumeux:Funky Funky:Funky Funky Funky:Gelatto:Fantôme:Vérités incohérentes:Mi-journée 1:Mi-journée 2:Mi-journée 3:Mi-journée 4:Nuit:Pirate:Mauve:Rêve de navigateur:Sensualité pure - </string> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml deleted file mode 100644 index 98c385d29f..0000000000 --- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DELLE CICLO GIORNO/NOTTE"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo giorno/notte" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/> - <button label_selected="Cancella voce" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Impostazioni del fotogramma chiave: - </text> - <text name="WLCurKeyTimeText"> - Tempo: - </text> - <spinner label="Ora" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Impostazione chiave: - </text> - <combo_box label="Programma:" name="WLKeyPresets"/> - <text name="DayCycleText"> - Raggruppa: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Lunghezza del ciclo: - </text> - <spinner label="Ore" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Anteprima: - </text> - <button label="Avvia" label_selected="Avvia" name="WLAnimSky"/> - <button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/> - <button label="Usa l'ora della proprietà" label_selected="Vai all'ora della proprietà" name="WLUseLindenTime"/> - <button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/> - <button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_env_settings.xml b/indra/newview/skins/default/xui/it/floater_env_settings.xml deleted file mode 100644 index 1c17c18e84..0000000000 --- a/indra/newview/skins/default/xui/it/floater_env_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DELL'AMBIENTE"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Ora del -giorno - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Intensità delle -Nuvole - </text> - <text name="EnvWaterColorText"> - Colore -dell'Acqua - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Clicca per aprire il selettore dei colori"/> - <text name="EnvWaterFogText"> - Nebbiosità -dell'acqua - </text> - <button bottom="-144" label="Usa orario della regione" name="EnvUseEstateTimeButton" width="145"/> - <button label="Cielo avanzato" name="EnvAdvancedSkyButton"/> - <button label="Acqua avanzata" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml deleted file mode 100644 index b25f0a6266..0000000000 --- a/indra/newview/skins/default/xui/it/floater_water.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR AVANZATO DELL'ACQUA"> - <text name="KeyFramePresetsText" width="245"> - Impostazioni predeterminate dell'acqua: - </text> - <combo_box left_delta="245" name="WaterPresetsCombo" width="150"/> - <button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/> - <button label="Salva" label_selected="Salva" name="WaterSavePreset"/> - <button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="IMPOSTAZIONI" name="Settings"> - <text name="BHText"> - Colore della nebbiosità dell'acqua - </text> - <button label="?" left="209" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Clicca per aprire il selettore dei colori"/> - <text font="SansSerifSmall" name="WaterFogDensText"> - Esponente di densità della nebbia - dell'acqua - </text> - <slider bottom_delta="-40" name="WaterFogDensity"/> - <button label="?" left="209" name="WaterFogDensityHelp"/> - <text bottom="-140" font="SansSerifSmall" name="WaterUnderWaterFogModText"> - Regolatore effetto nebbia subacquea - </text> - <button label="?" left="209" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Scala di riflessione delle onde - </text> - <button label="?" left="415" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Scala Fresnel - </text> - <button label="?" left="415" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Offset Fresnel - </text> - <button label="?" left="415" name="WaterFresnelOffsetHelp"/> - <text font="SansSerifSmall" name="DensMultText"> - Scala di rifrazione nell'acqua - dall'alto - </text> - <slider bottom_delta="-40" name="WaterScaleAbove"/> - <button label="?" left="650" name="WaterScaleAboveHelp"/> - <text bottom="-70" font="SansSerifSmall" name="WaterScaleBelowText"> - Scala di rifrazione nell'acqua - dal basso - </text> - <slider bottom_delta="-40" name="WaterScaleBelow"/> - <button label="?" left="650" name="WaterScaleBelowHelp"/> - <text bottom="-122" name="MaxAltText"> - Moltiplicatore della sfocatura - </text> - <button label="?" left="650" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMMAGINE" name="Waves"> - <text name="BHText"> - Direzione della grande onda - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direzione della piccola onda - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Mappatura normale - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml deleted file mode 100644 index 6828d05be0..0000000000 --- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO"> - <text name="KeyFramePresetsText" width="105"> - Cieli predefiniti: - </text> - <combo_box left_delta="105" name="WLPresetsCombo"/> - <button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/> - <button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/> - <button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/> - <button font="SansSerifSmall" label="Editor del ciclo giorno/notte" label_selected="Editor del ciclo giorno/notte" left_delta="85" name="WLDayCycleMenuButton" width="165"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Blu dell'Orizzonte - </text> - <button label="?" left="189" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text font="SansSerifSmall" name="BDensText"> - Altezza della Foschia all'Orizzonte - </text> - <button label="?" left="189" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densità del Blu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densità della Foschia - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Moltiplicatore di Densità - </text> - <button label="?" left="645" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Moltiplicatore della Distanza - </text> - <button label="?" left="645" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitudine Massima - </text> - <button label="?" left="645" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ILLUMINAZIONE" name="Lighting"> - <text name="SLCText"> - Colore Sole/Luna - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posizione Sole/Luna - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiente - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Angolo Est - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Corona intorno al sole - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Focus" name="WLGlowB"/> - <slider label="Grandezza" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma della Scena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Luminosità delle stelle - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUVOLE" name="Clouds"> - <text name="WLCloudColorText"> - Colore delle Nuvole - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Nuvole XY/Densità - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Copertura delle Nuvole - </text> - <button label="?" left="415" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Altitudine delle Nuvole - </text> - <button label="?" left="415" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Dettagli Nuvole (XY/ Densità) - </text> - <button label="?" left="415" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Scorrimento delle X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Blocca" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Scorrimento delle Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Blocca" name="WLCloudLockY"/> - <check_box label="Mostra le Nuvole Classiche" name="DrawClassicClouds"/> - <button label="?" left="645" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml deleted file mode 100644 index b0949cd4e0..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="デイサイクル編集"> - <tab_container name="Day Cycle Tabs"> - <panel label="デイサイクル" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 深夜 12時 - </text> - <text name="WL3am"> - 午前 3時 - </text> - <text name="WL6am"> - 午前 6時 - </text> - <text name="WL9amHash"> - 午前 9時 - </text> - <text name="WL12pmHash"> - 正午 12時 - </text> - <text name="WL3pm"> - 午後 3時 - </text> - <text name="WL6pm"> - 午後 6時 - </text> - <text name="WL9pm"> - 午後 9時 - </text> - <text name="WL12am2"> - 深夜 12時 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="キーの追加" label_selected="キーの追加" name="WLAddKey"/> - <button label="キーの削除" label_selected="キーの削除" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - キーフレームの設定： - </text> - <text name="WLCurKeyTimeText"> - キータイム： - </text> - <spinner label="時間" name="WLCurKeyHour"/> - <spinner label="分" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - キーの事前設定： - </text> - <combo_box label="事前設定" name="WLKeyPresets"/> - <text name="DayCycleText"> - スナップ： - </text> - <combo_box label="5 分" name="WLSnapOptions"/> - <text name="DayCycleText2"> - サイクルの長さ： - </text> - <spinner label="時間" name="WLLengthOfDayHour"/> - <spinner label="分" name="WLLengthOfDayMin"/> - <spinner label="秒" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - プレビュー： - </text> - <button label="再生" label_selected="再生" name="WLAnimSky"/> - <button label="停止" label_selected="停止" name="WLStopAnimSky"/> - <button label="不動産の時刻を使用" label_selected="不動産の時刻に変更" name="WLUseLindenTime"/> - <button label="デイテストを保存" label_selected="デイテストを保存" name="WLSaveDayCycle"/> - <button label="デイテストをロード" label_selected="デイテストをロード" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml deleted file mode 100644 index 1d5f26a6eb..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="自然環境エディター"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - 時刻 - </text> - <text name="EnvTimeText2"> - 正午 12:00 - </text> - <text name="EnvCloudText"> - 雲の量 - </text> - <text name="EnvWaterColorText"> - 水の色 - </text> - <color_swatch name="EnvWaterColor" tool_tip="クリックしてカラーピッカーを開きます"/> - <text name="EnvWaterFogText"> - 水中照度 - </text> - <button label="不動産の時刻を使用" name="EnvUseEstateTimeButton"/> - <button label="空の高度な設定" name="EnvAdvancedSkyButton"/> - <button label="水の高度な設定" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml deleted file mode 100644 index fb64332e79..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="水の高度な編集"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText"> - 水の事前設定： - </text> - <button label="新規" label_selected="新規" name="WaterNewPreset"/> - <button label="保存" label_selected="保存" name="WaterSavePreset"/> - <button label="削除" label_selected="削除" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="設定" name="Settings"> - <text name="BHText"> - 水中のフォグ効果の色 - </text> - <color_swatch name="WaterFogColor" tool_tip="クリックしてカラーピッカーを開きます"/> - <text name="WaterFogDensText"> - 水中の透明度指数 - </text> - <text name="WaterUnderWaterFogModText"> - 水中のフォグ効果加減 - </text> - <text name="BDensText"> - さざ波の反射スケール - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - フレネルのスケール - </text> - <text name="FresnelOffsetText"> - フレネルのオフセット - </text> - <text name="DensMultText"> - 水面の屈折スケール - </text> - <text name="WaterScaleBelowText"> - 水中の屈折スケール - </text> - <text name="MaxAltText"> - 不透明度の増幅 - </text> - </panel> - <panel label="画像" name="Waves"> - <text name="BHText"> - 大波の方向 - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - 小波の方向 - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - ノーマルマップ - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml deleted file mode 100644 index feb94ef73e..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="空の高度な編集"> - <text name="KeyFramePresetsText"> - 空の事前設定： - </text> - <button label="新規" label_selected="新規" name="WLNewPreset"/> - <button label="保存" label_selected="保存" name="WLSavePreset"/> - <button label="削除" label_selected="削除" name="WLDeletePreset"/> - <button label="デイサイクル編集" label_selected="デイサイクル編集" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="大気" name="Atmosphere"> - <text name="BHText"> - 空の配色 - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - 空と遠景の露光 - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - 空の配色と濃度 - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - 大気の不透明度 - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - 大気の不透明度の増幅 - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - 視界の増幅 - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - 最大高度 - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ライティング" name="Lighting"> - <text name="SLCText"> - 太陽/月の色 - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - 太陽/月の位置 - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - アンビエント - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - 東の角度 - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - 太陽の輝き - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="フォーカス " name="WLGlowB"/> - <slider label="サイズ " name="WLGlowR"/> - <text name="SceneGammaText"> - 風景ガンマ - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - 星の輝き - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="雲" name="Clouds"> - <text name="WLCloudColorText"> - 雲の色 - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - 雲の XY/密度 - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - 雲の量 - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - 雲のスケール - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - 雲の詳細 (XY/密度) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - 雲の移動速度 (X 方向) - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="ロック" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - 雲の移動速度 (Y 方向) - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="ロック" name="WLCloudLockY"/> - <check_box label="従来の雲を描画" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml deleted file mode 100644 index 1f3e045a75..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_day_cycle_options.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="DAGCYCLUS EDITOR"> - <tab_container name="Day Cycle Tabs"> - <panel label="Dagcyclus" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 0:00 - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Key toevoegen" label_selected="Key toevoegen" name="WLAddKey"/> - <button label="Key verwijderen" label_selected="Key verwijderen" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Gemarkeerde frame instelling: - </text> - <text name="WLCurKeyTimeText"> - Markering tijd: - </text> - <spinner label="Uur" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Markering voorinstelling: - </text> - <combo_box label="Voorinstelling" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Lengte van cyclus: - </text> - <spinner label="Uur" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sec" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Voorbeeld: - </text> - <button label="Afspelen" label_selected="Afspelen" name="WLAnimSky"/> - <button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Gebruik estatetijd" label_selected="Ga naar Estate tijd" name="WLUseLindenTime"/> - <button label="Opslaan testdag" label_selected="Opslaan testdag" name="WLSaveDayCycle"/> - <button label="Laad testdag" label_selected="Laad testdag" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_env_settings.xml b/indra/newview/skins/default/xui/nl/floater_env_settings.xml deleted file mode 100644 index 3c207040d2..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_env_settings.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="OMGEVING EDITOR"> - <text bottom="-42" name="EnvTimeText"> - Tijd van de -dag - </text> - <text bottom_delta="-36" name="EnvTimeText2"> - 0:00 - </text> - <text name="EnvCloudText"> - Wolkendek - </text> - <text name="EnvWaterColorText"> - Waterkleur - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Klik om de kleurkiezer te openen"/> - <text name="EnvWaterFogText"> - Watermist - </text> - <button label="Gebruik estate tijd" name="EnvUseEstateTimeButton"/> - <button label="Geavanceerde lucht" name="EnvAdvancedSkyButton"/> - <button label="Geavanceerd water" name="EnvAdvancedWaterButton"/> - <button label="?" name="EnvSettingsHelpButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_water.xml b/indra/newview/skins/default/xui/nl/floater_water.xml deleted file mode 100644 index 1fb1ca241b..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_water.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="GEAVANCEERDE WATER EDITOR"> - <combo_box bottom="-50" height="18" left_delta="116" name="WaterPresetsCombo" width="150" /> - <text name="KeyFramePresetsText"> - Watervoorinstellingen - </text> - <button label="Nieuw" label_selected="Nieuw" name="WaterNewPreset" left_delta="190"/> - <button label="Opslaan" label_selected="Opslaan" name="WaterSavePreset"/> - <button label="Verwijderen" label_selected="Verwijderen" name="WaterDeletePreset" width="80"/> - <tab_container name="Water Tabs"> - <panel label="Instellingen" name="Settings"> - <text name="BHText"> - Watermistkleur - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Klik om de kleurkiezer te openen"/> - <text name="WaterFogDensText"> - Mistdichtheidsexponent - </text> - <button label="?" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Onderwatermist wijziger - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Reflectie wavelet schaal - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Fresnelschaal - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Fresnelverplaatsing - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refractieschaal boven - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refractieschaal onder - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Wazigheidvermeerderaar - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="Afbeelding" name="Waves"> - <text name="BHText"> - Grote golven richting - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Kleine golf richting - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Normaalmap - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml b/indra/newview/skins/default/xui/nl/floater_windlight_options.xml deleted file mode 100644 index b26dd7916e..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_windlight_options.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="GEAVANCEERDE LUCHT EDITOR"> - <combo_box allow_text_entry="false" follows="left|top" mouse_opaque="true" name="WLPresetsCombo"/> - <text name="KeyFramePresetsText"> - Lucht voorinstellingen - </text> - <button label="Nieuw" label_selected="Nieuw" name="WLNewPreset"/> - <button label="Opslaan" label_selected="Opslaan" name="WLSavePreset"/> - <button label="Verwijderen" label_selected="Verwijderen" name="WLDeletePreset"/> - <button label="Dag cyclus editor" label_selected="Dag cyclus editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="Atmosfeer" name="Atmosphere"> - <text name="BHText"> - Blauw Horizon - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Nevel horizon - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Blauw dichtheid - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Nevel dichtheid - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Dichtheidsfactor - </text> - <button label="?" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Afstandsfactor - </text> - <button label="?" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Max hoogte - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="Licht" name="Lighting"> - <text name="SLCText"> - Zon/maan kleur - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Zon/maan positie - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Omgeving - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Oosthoek - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Zonnegloed - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Focus " name="WLGlowB"/> - <slider label="Grootte" name="WLGlowR"/> - <text name="SceneGammaText"> - Scenegamma - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Ster helderheid - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="Wolken" name="Clouds"> - <text name="WLCloudColorText"> - Wolkenkleur - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Wolken (XY/Dichtheid) - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Wolkenbedekking - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Wolkenschaal - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text name="WLCloudDetailText"> - Wolkendetail (XY/Dichtheid) - </text> - <button label="?" name="WLCloudDetailHelp" left="404"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Wolk verplaatsing X - </text> - <button label="?" name="WLCloudScrollXHelp" left="600"/> - <check_box label="Vastzetten" name="WLCloudLockX" left="622"/> - <text name="WLCloudScrollYText"> - Wolk verplaatsing Y - </text> - <button label="?" name="WLCloudScrollYHelp" left="600"/> - <check_box label="Vastzetten" name="WLCloudLockY" left="622"/> - <check_box label="Teken klassieke wolken" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp" left="620"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml deleted file mode 100644 index f3929df3e3..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDYTOR CYKLU DNIA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Cykl dnia" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <multi_slider label="" name="WLTimeSlider"/> - <multi_slider label="" name="WLDayCycleKeys"/> - <text name="WL12am"> - 12am - </text> - <text name="WL3am"> - 3am - </text> - <text name="WL6am"> - 6am - </text> - <text name="WL9amHash"> - 9am - </text> - <text name="WL12pmHash"> - 12pm - </text> - <text name="WL3pm"> - 3pm - </text> - <text name="WL6pm"> - 6pm - </text> - <text name="WL9pm"> - 9pm - </text> - <text name="WL12am2"> - 12am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Dodaj" label_selected="Dodaj" name="WLAddKey"/> - <button label="Usuń" label_selected="Usuń" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Preferencje czasu: - </text> - <text name="WLCurKeyTimeText"> - Czas: - </text> - <spinner label="Godz" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Ustawienia: - </text> - <combo_box label="Preset" name="WLKeyPresets"/> - <text name="DayCycleText"> - Przerwij: - </text> - <combo_box label="5 min" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Długość cyklu: - </text> - <spinner label="Godz" name="WLLengthOfDayHour"/> - <spinner label="Min" name="WLLengthOfDayMin"/> - <spinner label="Sek" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Przeglądaj: - </text> - <button label="Start" label_selected="Start" name="WLAnimSky"/> - <button label="Stop" label_selected="Stop" name="WLStopAnimSky"/> - <button label="Używaj czasu regionu" label_selected="Używaj czasu regionu" name="WLUseLindenTime"/> - <button label="Zapisz test dnia" label_selected="Zapisz test dnia" name="WLSaveDayCycle"/> - <button label="Załaduj test dnia" label_selected="Załaduj test dnia" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml deleted file mode 100644 index 3ab854fbbb..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDYTOR ŚRODOWISKA"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Czas - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <slider label="" name="EnvTimeSlider"/> - <text name="EnvCloudText"> - Chmury: - </text> - <slider label="" name="EnvCloudSlider"/> - <text name="EnvWaterColorText"> - Kolor wody - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/> - <text name="EnvWaterFogText"> - Zamglenie: - </text> - <slider label="" name="EnvWaterFogSlider"/> - <button label="Używaj czasu regionu" name="EnvUseEstateTimeButton"/> - <button label="Zaawansowane niebo" name="EnvAdvancedSkyButton"/> - <button label="Zaawansowana woda" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml deleted file mode 100644 index 9720dae516..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_water.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="ZAAWANSOWANY EDYTOR WODY"> - <text name="KeyFramePresetsText"> - Ustawienia wody: - </text> - <button label="Nowe" label_selected="Nowe" name="WaterNewPreset"/> - <button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset"/> - <button label="Usuń" label_selected="Usuń" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="USTAWIENIA" name="Settings"> - <text name="BHText"> - Kolor podwodnej mgły - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Kliknij aby wybrać kolor"/> - <text name="WaterFogDensText"> - Wykładnik gęstości mgły - </text> - <button label="?" name="WaterFogDensityHelp"/> - <slider label="" name="WaterFogDensity"/> - <text name="WaterUnderWaterFogModText"> - Modyfikator mgły - </text> - <button label="?" name="WaterUnderWaterFogModHelp"/> - <slider label="" name="WaterUnderWaterFogMod"/> - <text name="BDensText"> - Skala zmarszczeń - </text> - <button label="?" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <slider label="" name="WaterNormalScaleX"/> - <slider label="" name="WaterNormalScaleY"/> - <slider label="" name="WaterNormalScaleZ"/> - <text name="HDText"> - Skala Fresnela - </text> - <button label="?" name="WaterFresnelScaleHelp"/> - <slider label="" name="WaterFresnelScale"/> - <text name="FresnelOffsetText"> - Przesunięcie Fresnela - </text> - <button label="?" name="WaterFresnelOffsetHelp"/> - <slider label="" name="WaterFresnelOffset"/> - <text name="DensMultText"> - Górna refrakcja - </text> - <button label="?" name="WaterScaleAboveHelp"/> - <slider label="" name="WaterScaleAbove"/> - <text name="WaterScaleBelowText"> - Dolna refrakcja - </text> - <button label="?" name="WaterScaleBelowHelp"/> - <slider label="" name="WaterScaleBelow"/> - <text name="MaxAltText"> - Mnożnik rozmycia - </text> - <button label="?" name="WaterBlurMultiplierHelp"/> - <slider label="" name="WaterBlurMult"/> - </panel> - <panel label="OBRAZ" name="Waves"> - <text name="BHText"> - Kierunek dużych fal - </text> - <button label="?" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <slider label="" name="WaterWave1DirX"/> - <slider label="" name="WaterWave1DirY"/> - <text name="BHText2"> - Kierunek małych fal - </text> - <button label="?" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <slider label="" name="WaterWave2DirX"/> - <slider label="" name="WaterWave2DirY"/> - <text name="BHText3"> - Mapa normalnych - </text> - <button label="?" name="WaterNormalMapHelp"/> - <texture_picker label="" name="WaterNormalMap"/> - </panel> - </tab_container> - <string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml deleted file mode 100644 index 930e904464..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="ZAAWANSOWANY EDYTOR NIEBA"> - <text name="KeyFramePresetsText"> - Ustawienia nieba: - </text> - <button label="Nowe" label_selected="Nowe" name="WLNewPreset"/> - <button label="Zapisz" label_selected="Zapisz" name="WLSavePreset"/> - <button label="Usuń" label_selected="Usuń" name="WLDeletePreset"/> - <button label="Edytor cyklu dnia" label_selected="Edytor cyklu dnia" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Horyzont błękitu - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <slider label="" name="WLBlueHorizonR"/> - <slider label="" name="WLBlueHorizonG"/> - <slider label="" name="WLBlueHorizonB"/> - <slider label="" name="WLBlueHorizonI"/> - <text name="BDensText"> - Horyzont zamglenia - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <slider label="" name="WLHazeHorizon"/> - <text name="BDensText2"> - Gęstość błękitu - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <slider label="" name="WLBlueDensityR"/> - <slider label="" name="WLBlueDensityG"/> - <slider label="" name="WLBlueDensityB"/> - <slider label="" name="WLBlueDensityI"/> - <text name="HDText"> - Gęstość zamglenia - </text> - <button label="?" name="WLHazeDensityHelp"/> - <slider label="" name="WLHazeDensity"/> - <text name="DensMultText"> - Mnożnik gęsości - </text> - <button label="?" name="WLDensityMultHelp"/> - <slider label="" name="WLDensityMult"/> - <text name="WLDistanceMultText"> - Mnożnik dystansu - </text> - <button label="?" name="WLDistanceMultHelp"/> - <slider label="" name="WLDistanceMult"/> - <text name="MaxAltText"> - Max wysokość - </text> - <button label="?" name="WLMaxAltitudeHelp"/> - <slider label="" name="WLMaxAltitude"/> - </panel> - <panel label="ŚWIATŁO" name="Lighting"> - <text name="SLCText"> - Kolor Słońca/Księżyca - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLSunlightR"/> - <slider label="" name="WLSunlightG"/> - <slider label="" name="WLSunlightB"/> - <slider label="" name="WLSunlightI"/> - <text name="TODText"> - Pozycja Słońca/Księżyca - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <slider label="" name="WLSunAngle"/> - <text name="WLAmbientText"> - Otoczenie - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <slider label="" name="WLAmbientR"/> - <slider label="" name="WLAmbientG"/> - <slider label="" name="WLAmbientB"/> - <slider label="" name="WLAmbientI"/> - <text name="WLEastAngleText"> - Pozycja wschodu - </text> - <button label="?" name="WLEastAngleHelp"/> - <slider label="" name="WLEastAngle"/> - <text name="SunGlowText"> - Blask Słońca - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Ostrość" name="WLGlowB"/> - <slider label="Rozmiar" name="WLGlowR"/> - <text name="SceneGammaText"> - Jasność obrazu - </text> - <button label="?" name="WLSceneGammaHelp"/> - <slider label="" name="WLGamma"/> - <text name="WLStarText"> - Blask gwiazd - </text> - <button label="?" name="WLStarBrightnessHelp"/> - <slider label="" name="WLStarAlpha"/> - </panel> - <panel label="CHMURY" name="Clouds"> - <text name="WLCloudColorText"> - Kolor chmur - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <slider label="" name="WLCloudColorR"/> - <slider label="" name="WLCloudColorG"/> - <slider label="" name="WLCloudColorB"/> - <slider label="" name="WLCloudColorI"/> - <text name="WLCloudColorText2"> - Chmury (XY/Gęstość) - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - G - </text> - <slider label="" name="WLCloudX"/> - <slider label="" name="WLCloudY"/> - <slider label="" name="WLCloudDensity"/> - <text name="WLCloudCoverageText"> - Pokrycie chmur - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <slider label="" name="WLCloudCoverage"/> - <text name="WLCloudScaleText"> - Skala chmur - </text> - <button label="?" name="WLCloudScaleHelp"/> - <slider label="" name="WLCloudScale"/> - <text name="WLCloudDetailText"> - Szczegóły (XY/gęstość) - </text> - <button label="?" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - G - </text> - <slider label="" name="WLCloudDetailX"/> - <slider label="" name="WLCloudDetailY"/> - <slider label="" name="WLCloudDetailDensity"/> - <text name="WLCloudScrollXText"> - Przewijanie chmur X - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Zablokuj" name="WLCloudLockX"/> - <slider label="" name="WLCloudScrollX"/> - <text name="WLCloudScrollYText"> - Przewijanie chmur Y - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Zablokuj" name="WLCloudLockY"/> - <slider label="" name="WLCloudScrollY"/> - <check_box label="Klasyczne chmury" name="DrawClassicClouds"/> - <button label="?" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> - <string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </string> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml deleted file mode 100644 index 9560a3b418..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="EDITOR DE CICLO DE DIA"> - <tab_container name="Day Cycle Tabs"> - <panel label="Ciclo do dia" name="Day Cycle"> - <button label="?" name="WLDayCycleHelp"/> - <text name="WL12am"> - 0:00 - </text> - <text name="WL3am"> - 3:00 - </text> - <text name="WL6am"> - 6:00 - </text> - <text name="WL9amHash"> - 9:00 - </text> - <text name="WL12pmHash"> - 12:00 - </text> - <text name="WL3pm"> - 15:00 - </text> - <text name="WL6pm"> - 18:00 - </text> - <text name="WL9pm"> - 21:00 - </text> - <text name="WL12am2"> - 24:00 - </text> - <button label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/> - <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Configurações de Quadro-chave: - </text> - <text name="WLCurKeyTimeText"> - Tempo-chave: - </text> - <spinner label="Hora" name="WLCurKeyHour"/> - <spinner label="Minutos" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Ajuste-chave: - </text> - <combo_box label="Ajuste" name="WLKeyPresets"/> - <text name="DayCycleText"> - Grudar: - </text> - <combo_box label="5 minutos" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Duração do Ciclo: - </text> - <spinner label="Hora" name="WLLengthOfDayHour"/> - <spinner label="Min." name="WLLengthOfDayMin"/> - <spinner label="Seg." name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - Visualizar - </text> - <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/> - <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/> - <button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/> - <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/> - <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml deleted file mode 100644 index 3ca8d934c9..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="EDITOR DO AMBIENTE"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Hora do Dia - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Cobertura de -Nuvens - </text> - <text name="EnvWaterColorText"> - Cor da água - </text> - <color_swatch label="" name="EnvWaterColor" tool_tip="Selecionar a cor"/> - <text name="EnvWaterFogText"> - Névoa da -água - </text> - <button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/> - <button label="Céu Avançado" left="167" name="EnvAdvancedSkyButton" width="155"/> - <button label="Água Avançada" left="326" name="EnvAdvancedWaterButton" width="155"/> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml deleted file mode 100644 index b2a06f4ff2..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_water.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="EDITOR DE ÁGUA AVANÇADO"> - <text name="KeyFramePresetsText" width="175"> - Pré-configurações da Água: - </text> - <combo_box left_delta="175" name="WaterPresetsCombo" width="150"/> - <button label="Novo" label_selected="Novo" name="WaterNewPreset"/> - <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/> - <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="DEFINIÇÕES" name="Settings"> - <text name="BHText"> - Cor da névoa da Água - </text> - <button label="?" name="WaterFogColorHelp"/> - <color_swatch label="" name="WaterFogColor" tool_tip="Selecionar a cor"/> - <text name="WaterFogDensText"> - Expoente da Densidade de névoa - </text> - <button label="?" left="209" name="WaterFogDensityHelp"/> - <text name="WaterUnderWaterFogModText"> - Modificador da névoa Subaquática - </text> - <button label="?" left="209" name="WaterUnderWaterFogModHelp"/> - <text name="BDensText"> - Escala da Marola de Reflexão - </text> - <button label="?" left="415" name="WaterNormalScaleHelp"/> - <text name="BHText2"> - 1 - </text> - <text name="BHText3"> - 2 - </text> - <text name="BHText4"> - 3 - </text> - <text name="HDText"> - Escala de Fresnel - </text> - <button label="?" left="415" name="WaterFresnelScaleHelp"/> - <text name="FresnelOffsetText"> - Deslocamento de Fresnel - </text> - <button label="?" left="415" name="WaterFresnelOffsetHelp"/> - <text name="DensMultText"> - Refratar a Escala para Cima - </text> - <button label="?" left="640" name="WaterScaleAboveHelp"/> - <text name="WaterScaleBelowText"> - Refratar a Escala para Baixo - </text> - <button label="?" left="640" name="WaterScaleBelowHelp"/> - <text name="MaxAltText"> - Multiplicador de Difusão - </text> - <button label="?" left="640" name="WaterBlurMultiplierHelp"/> - </panel> - <panel label="IMAGEM" name="Waves"> - <text name="BHText"> - Direção da Onda Maior - </text> - <button label="?" left="170" name="WaterWave1Help"/> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Direção da Onda Pequena - </text> - <button label="?" left="170" name="WaterWave2Help"/> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - Mapa Normal - </text> - <button label="?" name="WaterNormalMapHelp"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml deleted file mode 100644 index ec459bbb26..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="EDITOR DE CÉU AVANÇADO"> - <text name="KeyFramePresetsText" width="140"> - Pré-definições de Céu: - </text> - <combo_box left_delta="140" name="WLPresetsCombo"/> - <button label="Novo" label_selected="Novo" name="WLNewPreset"/> - <button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/> - <button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/> - <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSFERA" name="Atmosphere"> - <text name="BHText"> - Horizonte Azul - </text> - <button label="?" name="WLBlueHorizonHelp"/> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Horizonte da Neblina - </text> - <button label="?" name="WLHazeHorizonHelp"/> - <text name="BDensText2"> - Densidade de Azul - </text> - <button label="?" name="WLBlueDensityHelp"/> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Densidade da Neblina - </text> - <button label="?" name="WLHazeDensityHelp"/> - <text name="DensMultText"> - Multiplicador de Densidade - </text> - <button label="?" left="635" name="WLDensityMultHelp"/> - <text name="WLDistanceMultText"> - Multiplicador de Distância - </text> - <button label="?" left="635" name="WLDistanceMultHelp"/> - <text name="MaxAltText"> - Altitude Máxima - </text> - <button label="?" left="635" name="WLMaxAltitudeHelp"/> - </panel> - <panel label="ILUMINAÇÃO" name="Lighting"> - <text name="SLCText"> - Cor do Sol/Lua - </text> - <button label="?" name="WLSunlightColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Posição do Sol/Lua - </text> - <button label="?" name="WLTimeOfDayHelp"/> - <text name="WLAmbientText"> - Ambiente - </text> - <button label="?" name="WLAmbientHelp"/> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - Ângulo Leste - </text> - <button label="?" name="WLEastAngleHelp"/> - <text name="SunGlowText"> - Brilho do Sol - </text> - <button label="?" name="WLSunGlowHelp"/> - <slider label="Foco" name="WLGlowB"/> - <slider label="Tamanho" name="WLGlowR"/> - <text name="SceneGammaText"> - Gamma da Cena - </text> - <button label="?" name="WLSceneGammaHelp"/> - <text name="WLStarText"> - Brilho da Estrela - </text> - <button label="?" name="WLStarBrightnessHelp"/> - </panel> - <panel label="NUVENS" name="Clouds"> - <text name="WLCloudColorText"> - Cor da Nuvem - </text> - <button label="?" name="WLCloudColorHelp"/> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Densidade/ XY da Nuvem - </text> - <button label="?" name="WLCloudDensityHelp"/> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Cobertura da Nuvem - </text> - <button label="?" name="WLCloudCoverageHelp"/> - <text name="WLCloudScaleText"> - Escala da Nuvem - </text> - <button label="?" name="WLCloudScaleHelp"/> - <text font="SansSerifSmall" name="WLCloudDetailText"> - Detalhe da Nuvem (XY/Densidade) - </text> - <button label="?" left="421" name="WLCloudDetailHelp"/> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Rolagem X da Nuvem - </text> - <button label="?" name="WLCloudScrollXHelp"/> - <check_box label="Travar" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Rolagem Y da Nuvem - </text> - <button label="?" name="WLCloudScrollYHelp"/> - <check_box label="Travar" name="WLCloudLockY"/> - <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/> - <button label="?" left="645" name="WLClassicCloudsHelp"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml deleted file mode 100644 index 28d2ba6ed4..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Day Cycle Floater" title="日循環編輯器"> - <tab_container name="Day Cycle Tabs"> - <panel label="日循環" name="Day Cycle"> - <multi_slider initial_value="0" name="WLTimeSlider"/> - <multi_slider initial_value="0" name="WLDayCycleKeys"/> - <text name="WL12am"> - 12am - </text> - <text name="WL3am"> - 3am - </text> - <text name="WL6am"> - 6am - </text> - <text name="WL9amHash"> - 9am - </text> - <text name="WL12pmHash"> - 12pm - </text> - <text name="WL3pm"> - 3pm - </text> - <text name="WL6pm"> - 6pm - </text> - <text name="WL9pm"> - 9pm - </text> - <text name="WL12am2"> - 12am - </text> - <text name="WL12amHash"> - | - </text> - <text name="WL3amHash"> - I - </text> - <text name="WL6amHash"> - | - </text> - <text name="WL9amHash2"> - I - </text> - <text name="WL12pmHash2"> - | - </text> - <text name="WL3pmHash"> - I - </text> - <text name="WL6pmHash"> - | - </text> - <text name="WL9pmHash"> - I - </text> - <text name="WL12amHash2"> - | - </text> - <button label="Add Key" label_selected="Add Key" name="WLAddKey"/> - <button label="Delete Key" label_selected="Delete Key" name="WLDeleteKey"/> - <text name="WLCurKeyFrameText"> - Key Frame Settings: - </text> - <text name="WLCurKeyTimeText"> - Key Time: - </text> - <spinner label="Hour" name="WLCurKeyHour"/> - <spinner label="Min" name="WLCurKeyMin"/> - <text name="WLCurKeyTimeText2"> - Key Preset: - </text> - <combo_box label="Preset" name="WLKeyPresets"/> - <text name="DayCycleText"> - Snap: - </text> - <combo_box label="五分鐘" name="WLSnapOptions"/> - <text name="DayCycleText2"> - Length of Cycle: - </text> - <spinner label="小時" name="WLLengthOfDayHour"/> - <spinner label="分" name="WLLengthOfDayMin"/> - <spinner label="秒" name="WLLengthOfDaySec"/> - <text name="DayCycleText3"> - 預覽： - </text> - <button label="Play" label_selected="Play" name="WLAnimSky"/> - <button label="停止!" label_selected="停止" name="WLStopAnimSky"/> - <button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/> - <button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/> - <button label="Load Test Day" label_selected="Load Test Day" name="WLLoadDayCycle"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml deleted file mode 100644 index 65a97f0cff..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Time of Day - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Cloud Cover - </text> - <text name="EnvWaterColorText"> - Water Color - </text> - <color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/> - <text name="EnvWaterFogText"> - Water Fog - </text> - <button label="Use Estate Time" name="EnvUseEstateTimeButton"/> - <button label="Advanced Sky" name="EnvAdvancedSkyButton"/> - <button label="Advanced Water" name="EnvAdvancedWaterButton"/> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml deleted file mode 100644 index 5fb57272af..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_water.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Water Floater" title="進階水文編輯器"> - <floater.string name="WLDefaultWaterNames"> - Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez - </floater.string> - <text name="KeyFramePresetsText"> - Water Presets: - </text> - <button label="新增" label_selected="新增" name="WaterNewPreset"/> - <button label="儲存" label_selected="儲存" name="WaterSavePreset"/> - <button label="刪除" label_selected="刪除" name="WaterDeletePreset"/> - <tab_container name="Water Tabs"> - <panel label="設定" name="Settings"> - <text name="BHText"> - Water Fog Color - </text> - <color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/> - <text name="WaterFogDensText"> - Fog Density Exponent - </text> - <text name="WaterUnderWaterFogModText"> - Underwater Fog Modifier - </text> - <text name="BDensText"> - Reflection Wavelet Scale - </text> - <slider label="1" name="WaterNormalScaleX"/> - <slider label="2" name="WaterNormalScaleY"/> - <slider label="3" name="WaterNormalScaleZ"/> - <text name="HDText"> - Fresnel Scale - </text> - <text name="FresnelOffsetText"> - Fresnel Offset - </text> - <text name="DensMultText"> - Refract Scale Above - </text> - <text name="WaterScaleBelowText"> - Refract Scale Below - </text> - <text name="MaxAltText"> - Blur Multiplier - </text> - </panel> - <panel label="圖像" name="Waves"> - <text name="BHText"> - Big Wave Direction - </text> - <text name="WaterWave1DirXText"> - X - </text> - <text name="WaterWave1DirYText"> - Y - </text> - <text name="BHText2"> - Little Wave Direction - </text> - <text name="WaterWave2DirXText"> - X - </text> - <text name="WaterWave2DirYText"> - Y - </text> - <text name="BHText3"> - 正常地圖 - </text> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml deleted file mode 100644 index fce851cc90..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml +++ /dev/null @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="WindLight floater" title="進階天空編輯器"> - <floater.string name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text name="KeyFramePresetsText"> - Sky Presets: - </text> - <button label="新增" label_selected="新增" name="WLNewPreset"/> - <button label="儲存" label_selected="儲存" name="WLSavePreset"/> - <button label="刪除" label_selected="刪除" name="WLDeletePreset"/> - <button label="Day Cycle Editor" label_selected="Day Cycle Editor" name="WLDayCycleMenuButton"/> - <tab_container name="WindLight Tabs"> - <panel label="ATMOSPHERE" name="Atmosphere"> - <text name="BHText"> - Blue Horizon - </text> - <text name="BHText2"> - R - </text> - <text name="BHText3"> - G - </text> - <text name="BHText4"> - B - </text> - <text name="BHText5"> - I - </text> - <text name="BDensText"> - Haze Horizon - </text> - <text name="BDensText2"> - Blue Density - </text> - <text name="BHText6"> - R - </text> - <text name="BHText7"> - G - </text> - <text name="BHText8"> - B - </text> - <text name="BHText9"> - I - </text> - <text name="HDText"> - Haze Density - </text> - <text name="DensMultText"> - Density Multiplier - </text> - <text name="WLDistanceMultText"> - Distance Multiplier - </text> - <text name="MaxAltText"> - Max Altitude - </text> - </panel> - <panel label="LIGHTING" name="Lighting"> - <text name="SLCText"> - Sun/Moon Color - </text> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="TODText"> - Sun/Moon Position - </text> - <text name="WLAmbientText"> - Ambient - </text> - <text name="BHText5"> - R - </text> - <text name="BHText6"> - G - </text> - <text name="BHText7"> - B - </text> - <text name="BHText8"> - I - </text> - <text name="WLEastAngleText"> - East Angle - </text> - <text name="SunGlowText"> - Sun Glow - </text> - <slider label="Focus" name="WLGlowB"/> - <slider label="尺寸" name="WLGlowR"/> - <text name="SceneGammaText"> - Scene Gamma - </text> - <text name="WLStarText"> - Star Brightness - </text> - </panel> - <panel label="CLOUDS" name="Clouds"> - <text name="WLCloudColorText"> - Cloud Color - </text> - <text name="BHText"> - R - </text> - <text name="BHText2"> - G - </text> - <text name="BHText3"> - B - </text> - <text name="BHText4"> - I - </text> - <text name="WLCloudColorText2"> - Cloud XY/Density - </text> - <text name="BHText5"> - X - </text> - <text name="BHText6"> - Y - </text> - <text name="BHText7"> - D - </text> - <text name="WLCloudCoverageText"> - Cloud Coverage - </text> - <text name="WLCloudScaleText"> - Cloud Scale - </text> - <text name="WLCloudDetailText"> - Cloud Detail (XY/Density) - </text> - <text name="BHText8"> - X - </text> - <text name="BHText9"> - Y - </text> - <text name="BHText10"> - D - </text> - <text name="WLCloudScrollXText"> - Cloud Scroll X - </text> - <check_box label="Lock" name="WLCloudLockX"/> - <text name="WLCloudScrollYText"> - Cloud Scroll Y - </text> - <check_box label="Lock" name="WLCloudLockY"/> - <check_box label="Draw Classic Clouds" name="DrawClassicClouds"/> - </panel> - </tab_container> -</floater> diff --git a/indra/newview/tests/llfloaterdaycycle_stub.cpp b/indra/newview/tests/llfloaterdaycycle_stub.cpp deleted file mode 100644 index e6b145bcfc..0000000000 --- a/indra/newview/tests/llfloaterdaycycle_stub.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file llfloaterdaycycle_stub.cpp - * @brief stub class to allow unit testing - * - * $LicenseInfo:firstyear=2009&license=viewergpl$ - * Copyright (c) 2009, Linden Research, Inc. - * $/LicenseInfo$ - */ - -class LLFloaterDayCycle -{ -public: - static bool isOpen(void); - static LLFloaterDayCycle* instance(void); - static void syncMenu(void); -}; - -bool LLFloaterDayCycle::isOpen() { return true; } -LLFloaterDayCycle* LLFloaterDayCycle::instance() { return NULL; } -void LLFloaterDayCycle::syncMenu(void) {} diff --git a/indra/newview/tests/llfloaterenvsettings_stub.cpp b/indra/newview/tests/llfloaterenvsettings_stub.cpp deleted file mode 100644 index e9e792521f..0000000000 --- a/indra/newview/tests/llfloaterenvsettings_stub.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file llfloaterenvsettings_stub.cpp - * @brief stub class to allow unit testing - * - * $LicenseInfo:firstyear=2009&license=viewergpl$ - * Copyright (c) 2009, Linden Research, Inc. - * $/LicenseInfo$ - */ - -class LLFloaterEnvSettings -{ -public: - static bool isOpen(void); - static LLFloaterEnvSettings* instance(void); - void syncMenu(void); -}; - -bool LLFloaterEnvSettings::isOpen() { return true; } -LLFloaterEnvSettings* LLFloaterEnvSettings::instance() { return NULL; } -void LLFloaterEnvSettings::syncMenu(void) {} diff --git a/indra/newview/tests/llfloaterwindlight_stub.cpp b/indra/newview/tests/llfloaterwindlight_stub.cpp deleted file mode 100644 index f1891eaf21..0000000000 --- a/indra/newview/tests/llfloaterwindlight_stub.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/** - * @file llfloaterwindlight_stub.cpp - * @brief stub class to allow unit testing - * - * $LicenseInfo:firstyear=2009&license=viewergpl$ - * Copyright (c) 2009, Linden Research, Inc. - * $/LicenseInfo$ - */ - -class LLFloaterWindLight -{ -public: - static bool isOpen(void); - static LLFloaterWindLight* instance(void); - void syncMenu(void); -}; - -bool LLFloaterWindLight::isOpen() { return true; } -LLFloaterWindLight* LLFloaterWindLight::instance() { return NULL; } -void LLFloaterWindLight::syncMenu(void) {} diff --git a/indra/newview/tests/llwlparammanager_test.cpp b/indra/newview/tests/llwlparammanager_test.cpp index 3d31567335..a6c6a2abf4 100644 --- a/indra/newview/tests/llwlparammanager_test.cpp +++ b/indra/newview/tests/llwlparammanager_test.cpp @@ -26,9 +26,6 @@ #include "llglslshader_stub.cpp" #include "lldir_stub.cpp" #include "llsky_stub.cpp" -#include "llfloaterdaycycle_stub.cpp" -#include "llfloaterenvsettings_stub.cpp" -#include "llfloaterwindlight_stub.cpp" #include "llpipeline_stub.cpp" #include "llviewershadermgr_stub.cpp" |