summaryrefslogtreecommitdiff
path: root/indra/newview/llremoteparcelrequest.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-28 11:36:46 -0500
committerOz Linden <oz@lindenlab.com>2011-01-28 11:36:46 -0500
commit98140b3cdcd505aabe31fcd23db7a2603c8deed3 (patch)
treeb94c39ef7afbc4a091b1e4f2f7b4b2de599831a8 /indra/newview/llremoteparcelrequest.h
parent106c9124741afd50c3aaa5671743d5a939f1ad48 (diff)
parent4b354802c10e6e947a0ce0f023158e22fcd5bc4b (diff)
merge changes for storm-634
Diffstat (limited to 'indra/newview/llremoteparcelrequest.h')
-rw-r--r--indra/newview/llremoteparcelrequest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llremoteparcelrequest.h b/indra/newview/llremoteparcelrequest.h
index a6c62995a9..74cf1616df 100644
--- a/indra/newview/llremoteparcelrequest.h
+++ b/indra/newview/llremoteparcelrequest.h
@@ -98,7 +98,7 @@ public:
static void processParcelInfoReply(LLMessageSystem* msg, void**);
private:
- typedef std::multimap<LLUUID, LLRemoteParcelInfoObserver*> observer_multimap_t;
+ typedef std::multimap<LLUUID, LLHandle<LLRemoteParcelInfoObserver> > observer_multimap_t;
observer_multimap_t mObservers;
};