diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:48 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:48 -0700 |
| commit | c4992e30654775c54e3dc4fb583375ec079b23a4 (patch) | |
| tree | 31af4a671d5f0b238ffe99a141967bfc977cd69b /indra/newview/lllandmarklist.h | |
| parent | 88166e7d222bf18fc0324714dc44efef161bc409 (diff) | |
| parent | ea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff) | |
Merge from remote repo
Diffstat (limited to 'indra/newview/lllandmarklist.h')
| -rw-r--r-- | indra/newview/lllandmarklist.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h index ebf1b65e97..d9c3267142 100644 --- a/indra/newview/lllandmarklist.h +++ b/indra/newview/lllandmarklist.h @@ -74,7 +74,10 @@ protected: typedef std::set<LLUUID> landmark_bad_list_t; landmark_bad_list_t mBadList; - + + typedef std::map<LLUUID,F32> landmark_requested_list_t; + landmark_requested_list_t mRequestedList; + // *TODO: make the callback multimap a template class and make use of it // here and in LLLandmark. typedef std::multimap<LLUUID, loaded_callback_t> loaded_callback_map_t; |