diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
| commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
| tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/llfloaterworldmap.cpp | |
| parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 67c0b530eb..391e63f730 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -41,6 +41,7 @@ #include "llfloaterworldmap.h" #include "llagent.h" +#include "llagentcamera.h" #include "llbutton.h" #include "llcallingcard.h" #include "llcombobox.h" @@ -1220,12 +1221,12 @@ void LLFloaterWorldMap::centerOnTarget(BOOL animate) { // We've got the position finally, so we're no longer busy. JC // getWindow()->decBusyCount(); - pos_global = LLTracker::getTrackedPositionGlobal() - gAgent.getCameraPositionGlobal(); + pos_global = LLTracker::getTrackedPositionGlobal() - gAgentCamera.getCameraPositionGlobal(); } } else if(LLWorldMap::getInstance()->isTracking()) { - pos_global = LLWorldMap::getInstance()->getTrackedPositionGlobal() - gAgent.getCameraPositionGlobal();; + pos_global = LLWorldMap::getInstance()->getTrackedPositionGlobal() - gAgentCamera.getCameraPositionGlobal();; } else { |