diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-25 08:45:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-25 08:45:39 -0400 |
| commit | c5987522881a5254dd070d4f8daedb80ede4b2b8 (patch) | |
| tree | 8bc8254ab3c7e43619090376c7e55c2722098416 /indra/newview/llwlparammanager.h | |
| parent | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (diff) | |
| parent | 72d1efb1529ad0863d35b219a461f353a4b19353 (diff) | |
merge lastest updates from windlight integration branch
Diffstat (limited to 'indra/newview/llwlparammanager.h')
| -rw-r--r-- | indra/newview/llwlparammanager.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h index 2f1edce8fc..35acb7c5d6 100644 --- a/indra/newview/llwlparammanager.h +++ b/indra/newview/llwlparammanager.h @@ -144,9 +144,13 @@ public: } inline LLWLParamKey(std::string& stringVal) - : name(stringVal.substr(0, stringVal.length()-1)), - scope((EScope)atoi(stringVal.substr(stringVal.length()-1, stringVal.length()).c_str())) { + size_t len = stringVal.length(); + if (len > 0) + { + name = stringVal.substr(0, len - 1); + scope = (EScope) atoi(stringVal.substr(len - 1, len).c_str()); + } } inline std::string toStringVal() const @@ -289,7 +293,7 @@ public: std::map<LLWLParamKey, LLWLParamSet> finalizeFromDayCycle(LLWLParamKey::EScope scope); // returns all skies in map (intended to be called with output from a finalize) - LLSD createSkyMap(std::map<LLWLParamKey, LLWLParamSet> map); + static LLSD createSkyMap(std::map<LLWLParamKey, LLWLParamSet> map); // helper variables LLWLAnimator mAnimator; |