diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
| commit | 28ed8f84d86403cf90b7963b147d2ac5c6cf37c7 (patch) | |
| tree | cebb2895642b96aa64e8cf8c2eb402e8423165d6 /indra/newview/lllandmarklist.h | |
| parent | 9c3595465972ba4be916e871f6b0a62cc0c13d4a (diff) | |
| parent | 63b9bd43ff41da01d549f630bd838caff0dffd97 (diff) | |
Merge with SVN render-pipeline-8 branch
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; |