From 6fac1bf369f6f0fecd5724f8cff801d3b755cda0 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 19 Jan 2010 17:22:13 +0200 Subject: Fix for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. --HG-- branch : product-engine --- indra/newview/lllandmarklist.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/lllandmarklist.cpp') diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index bd9d22c327..355f048308 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -59,6 +59,12 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t LLLandmark* landmark = get_ptr_in_map(mList, asset_uuid); if(landmark) { + if(cb && !landmark->getGlobalPos(LLVector3d())) + { + // landmark is not completely loaded yet + loaded_callback_map_t::value_type vt(asset_uuid, cb); + mLoadedCallbackMap.insert(vt); + } return landmark; } else -- cgit v1.2.3 From 89f460cc9edcdf5651295748da34b842388e7a8b Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 20 Jan 2010 10:40:44 -0800 Subject: fix build error from PE tree. --- indra/newview/lllandmarklist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/lllandmarklist.cpp') diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp index 355f048308..ce84474c05 100644 --- a/indra/newview/lllandmarklist.cpp +++ b/indra/newview/lllandmarklist.cpp @@ -59,7 +59,8 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t LLLandmark* landmark = get_ptr_in_map(mList, asset_uuid); if(landmark) { - if(cb && !landmark->getGlobalPos(LLVector3d())) + LLVector3d dummy; + if(cb && !landmark->getGlobalPos(dummy)) { // landmark is not completely loaded yet loaded_callback_map_t::value_type vt(asset_uuid, cb); -- cgit v1.2.3