diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-22 21:30:26 -0400 |
| commit | fe64db61d6f10a9b31191090e2318aebc2d53b29 (patch) | |
| tree | 635d4a6bee25c1e4ef55421f147e9e06bf5faeb3 /indra/newview/llenvmanager.cpp | |
| parent | 48af8529a80052e9bc42f81f36896739f8aff861 (diff) | |
| parent | b92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 12c3070474..fa1c3b983e 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -35,6 +35,22 @@ #include "llwaterparammanager.h" #include "llwlhandlers.h" #include "llwlparammanager.h" +#include "lltrans.h" + +std::string LLWLParamKey::toString() const +{ + switch (scope) + { + case SCOPE_LOCAL: + return name + std::string(" (") + LLTrans::getString("Local") + std::string(")"); + break; + case SCOPE_REGION: + return name + std::string(" (") + LLTrans::getString("Region") + std::string(")"); + break; + default: + return name + " (?)"; + } +} std::string LLEnvPrefs::getWaterPresetName() const { |