V2 spatial partition, and all the pipeline changes that go with it.
Note: Deferred mode is not finished, and thus broken. Don't use!
This commit is contained in:
@@ -2065,6 +2065,9 @@ LLViewerWindow::~LLViewerWindow()
|
||||
{
|
||||
llinfos << "Destroying Window" << llendl;
|
||||
destroyWindow();
|
||||
|
||||
delete mDebugText;
|
||||
mDebugText = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -5392,11 +5395,15 @@ void LLPickInfo::fetchResults()
|
||||
|
||||
// put global position into land_pos
|
||||
LLVector3d land_pos;
|
||||
if (gViewerWindow->mousePointOnLandGlobal(mPickPt.mX, mPickPt.mY, &land_pos))
|
||||
if (!gViewerWindow->mousePointOnLandGlobal(mPickPt.mX, mPickPt.mY, &land_pos))
|
||||
{
|
||||
// Fudge the land focus a little bit above ground.
|
||||
mPosGlobal = land_pos + LLVector3d::z_axis * 0.1f;
|
||||
// The selected point is beyond the draw distance or is otherwise
|
||||
// not selectable. Return before calling mPickCallback().
|
||||
return;
|
||||
}
|
||||
|
||||
// Fudge the land focus a little bit above ground.
|
||||
mPosGlobal = land_pos + LLVector3d::z_axis * 0.1f;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user