Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLAgentCamera transition (2/2)

Browse Source
This commit is contained in:
Shyotl
2011-06-07 22:39:23 -05:00
parent a07e399801
commit 1434051f4e
6 changed files with 4553 additions and 3860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llworldmap.cpp
View File

@@ -744,12 +744,11 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
callback(handle, LLWorldMap::getInstance()->mSLURL, image_id, LLWorldMap::getInstance()->mSLURLTeleport);
}
}
if(LLAgent::lure_show)
if( gAgent.mPendingLure &&
(U16)(gAgent.mPendingLure->mPosGlobal.mdV[0] / REGION_WIDTH_UNITS) == x_regions &&
(U16)(gAgent.mPendingLure->mPosGlobal.mdV[1] / REGION_WIDTH_UNITS) == y_regions )
{
if((x_regions == LLAgent::lure_global_x) && (y_regions == LLAgent::lure_global_y))
{
gAgent.onFoundLureDestination();
}
gAgent.onFoundLureDestination();
}
}