diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-03-12 11:49:17 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-03-12 11:49:17 -0700 |
| commit | a0b8c3e029be9265152cb8919ebe9c2bc328b766 (patch) | |
| tree | d80885c5c193a1d31ccc331032b5c65e9c40eb65 | |
| parent | 9fe5728b4385ead4a4c74eed7917d93060510cdb (diff) | |
Windows lets you erase with a const iterator but linux does not.
| -rw-r--r-- | indra/llmessage/llexperiencecache.cpp | 19 | ||||
| -rw-r--r-- | indra/llmessage/llexperiencecache.h | 1 |
2 files changed, 1 insertions, 19 deletions
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp index 5cca918baf..648e2039a6 100644 --- a/indra/llmessage/llexperiencecache.cpp +++ b/indra/llmessage/llexperiencecache.cpp @@ -84,23 +84,6 @@ namespace LLExperienceCache sPendingQueue.erase(row[EXPERIENCE_ID].asUUID()); } - if(row.has(OWNER_ID)) - { - sPendingQueue.erase(row[OWNER_ID].asUUID()); - } - - if(!row.has(OWNER_ID)) - { - if(row.has(AGENT_ID) && row[AGENT_ID].asUUID().notNull()) - { - row[OWNER_ID]=row[AGENT_ID]; - } - else - { - row[OWNER_ID]=row[GROUP_ID]; - } - } - //signal signal_map_t::iterator sig_it = sSignalMap.find(public_key); if (sig_it != sSignalMap.end()) @@ -427,7 +410,7 @@ namespace LLExperienceCache int request_count = 0; while(!sAskQueue.empty() && request_count < sMaximumLookups) { - ask_queue_t::const_iterator it = sAskQueue.begin(); + ask_queue_t::iterator it = sAskQueue.begin(); const LLUUID& key = it->first; const std::string& key_type = it->second; diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h index 8b3443e5a9..e6129796b7 100644 --- a/indra/llmessage/llexperiencecache.h +++ b/indra/llmessage/llexperiencecache.h @@ -45,7 +45,6 @@ namespace LLExperienceCache const std::string AGENT_ID = "agent_id"; const std::string GROUP_ID = "group_id"; const std::string EXPERIENCE_ID = "public_id"; - const std::string OWNER_ID = "owner_id"; const std::string NAME = "name"; const std::string PROPERTIES = "properties"; const std::string EXPIRES = "expiration"; |