summaryrefslogtreecommitdiff
path: root/indra/newview/lleventinfo.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-19 17:31:05 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-19 17:31:05 -0700
commit1d5be6eca1969da3e6b923cbf5326d3bdc8b066f (patch)
treea03a2e782f5022ebbbe1ef933e3a11c1b9de00a6 /indra/newview/lleventinfo.cpp
parent97d2b740d3e700d86665183d5fc5cfcb3efe72d6 (diff)
parentd78520f6b7fd4a20bbb1d1291a34761efc1fd740 (diff)
merge
Diffstat (limited to 'indra/newview/lleventinfo.cpp')
-rw-r--r--indra/newview/lleventinfo.cpp36
1 files changed, 10 insertions, 26 deletions
diff --git a/indra/newview/lleventinfo.cpp b/indra/newview/lleventinfo.cpp
index d4175b6c84..9be45d18fb 100644
--- a/indra/newview/lleventinfo.cpp
+++ b/indra/newview/lleventinfo.cpp
@@ -87,35 +87,19 @@ void LLEventInfo::unpack(LLMessageSystem *msg)
}
// static
-void LLEventInfo::loadCategories(LLUserAuth::options_t event_options)
+void LLEventInfo::loadCategories(const LLSD& options)
{
- LLUserAuth::options_t::iterator resp_it;
- for (resp_it = event_options.begin();
- resp_it != event_options.end();
- ++resp_it)
+ for(LLSD::array_const_iterator resp_it = options.beginArray(),
+ end = options.endArray(); resp_it != end; ++resp_it)
{
- const LLUserAuth::response_t& response = *resp_it;
-
- LLUserAuth::response_t::const_iterator option_it;
-
- S32 cat_id = 0;
- option_it = response.find("category_id");
- if (option_it != response.end())
+ LLSD name = (*resp_it)["category_name"];
+ if(name.isDefined())
{
- cat_id = atoi(option_it->second.c_str());
+ LLSD id = (*resp_it)["category_id"];
+ if(id.isDefined())
+ {
+ LLEventInfo::sCategories[id.asInteger()] = name.asString();
+ }
}
- else
- {
- continue;
- }
-
- // Add the category id/name pair
- option_it = response.find("category_name");
- if (option_it != response.end())
- {
- LLEventInfo::sCategories[cat_id] = option_it->second;
- }
-
}
-
}