diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
| commit | 8aadfb1cb63a9527835c6c5127d041d924455505 (patch) | |
| tree | 3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/lllandmarklist.cpp | |
| parent | 622f8b59ceb286f955351b6185a98919f03ed136 (diff) | |
| parent | 20af2d325a4340aca997efbea752849e9f15d041 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/lllandmarklist.cpp')
| -rw-r--r-- | indra/newview/lllandmarklist.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index bd9d22c327..ce84474c05 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -59,6 +59,13 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t LLLandmark* landmark = get_ptr_in_map(mList, asset_uuid); if(landmark) { + LLVector3d dummy; + if(cb && !landmark->getGlobalPos(dummy)) + { + // landmark is not completely loaded yet + loaded_callback_map_t::value_type vt(asset_uuid, cb); + mLoadedCallbackMap.insert(vt); + } return landmark; } else |