diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 521134f26c..315cf45f43 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -251,58 +251,58 @@ BOOL LLKeywords::loadIntoLLSD(const std::string& filename, LLSD& data) return mLoaded; } -/** - * @brief Start processing the colour LLSD from its beginning. - * - * / -std::string LLKeywords::processColors() -{ - return processColors(mColors, ""); -} - -/** - * @brief Recursively process the colour LLSD from an arbitrary level. - * @desc Process the supplied LLSD for colour data. The strPrefix is a string - * of hyphen separated keys from previous levels. - * / -std::string LLKeywords::processColors(LLSD &settings, const std::string strPrefix) -{ - if (settings.isMap() || (! settings.isMap() && strPrefix != "") ) - { - LLSD llsd_map = settings; - - LLSD::map_iterator my_iter = llsd_map.beginMap(); - for ( ; my_iter != llsd_map.endMap(); ++my_iter) - { - std::string strGroup = strPrefix; - const LLSD::String& key = my_iter->first; - LLSD& value = my_iter->second; - - if (key == "color") - { - if (value.isMap() || value.isArray()) - { - addColorGroup(strGroup, readColor(value)); - } - else - { - LL_WARNS("Invalid Color") << "Invalid Color Entry - first: '" << key << "' second: '" << value << "'" << LL_ENDL; - } - } - else if (value.isMap()) - { - strGroup += (strGroup.length() == 0) ? my_iter->first : "-" + my_iter->first; - strGroup = processColors(value, strGroup); - } - else - { - LL_WARNS("Invalid Color") << "Invalid Color Entry - first: '" << key << "' second: '" << value << "'" << LL_ENDL; - } - } - } - return strPrefix; -} -*/ +///** +// * @brief Start processing the colour LLSD from its beginning. +// * +// */ +//std::string LLKeywords::processColors() +//{ +// return processColors(mColors, ""); +//} + +///** +// * @brief Recursively process the colour LLSD from an arbitrary level. +// * @desc Process the supplied LLSD for colour data. The strPrefix is a string +// * of hyphen separated keys from previous levels. +// */ +//std::string LLKeywords::processColors(LLSD &settings, const std::string strPrefix) +//{ +// if (settings.isMap() || (! settings.isMap() && strPrefix != "") ) +// { +// LLSD llsd_map = settings; + +// LLSD::map_iterator my_iter = llsd_map.beginMap(); +// for ( ; my_iter != llsd_map.endMap(); ++my_iter) +// { +// std::string strGroup = strPrefix; +// const LLSD::String& key = my_iter->first; +// LLSD& value = my_iter->second; +// +// if (key == "color") +// { +// if (value.isMap() || value.isArray()) +// { +// addColorGroup(strGroup, readColor(value)); +// } +// else +// { +// LL_WARNS("Invalid Color") << "Invalid Color Entry - first: '" << key << "' second: '" << value << "'" << LL_ENDL; +// } +// } +// else if (value.isMap()) +// { +// strGroup += (strGroup.length() == 0) ? my_iter->first : "-" + my_iter->first; +// strGroup = processColors(value, strGroup); +// } +// else +// { +// LL_WARNS("Invalid Color") << "Invalid Color Entry - first: '" << key << "' second: '" << value << "'" << LL_ENDL; +// } +// } +// } +// return strPrefix; +//} +//*/ void LLKeywords::processTokens() { |