FIRE-19720: Crash when teleporting on Littlefield grid - LLVOSurfacePatch::dirtyGeom() Firestorm_5.0.11

Tue, 19 Dec 2017 11:54:25 +0100

author
Ansariel
date
Tue, 19 Dec 2017 11:54:25 +0100
branch
Firestorm_5.0.11
changeset 53584
eaaa598509af
parent 53583
05afd804e0fa
child 53585
1dcf4d54abe6

FIRE-19720: Crash when teleporting on Littlefield grid - LLVOSurfacePatch::dirtyGeom()

indra/newview/llsurfacepatch.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llsurfacepatch.cpp	Tue Dec 19 10:41:32 2017 +0200
     1.2 +++ b/indra/newview/llsurfacepatch.cpp	Tue Dec 19 11:54:25 2017 +0100
     1.3 @@ -1004,14 +1004,26 @@
     1.4  			if (mVObjp)
     1.5  			{
     1.6  				mVObjp->dirtyGeom();
     1.7 -				if (getNeighborPatch(WEST))
     1.8 +				// <FS:Ansariel> FIRE-19720: Crash when teleporting on Littlefield grid - LLVOSurfacePatch::dirtyGeom()
     1.9 +				//if (getNeighborPatch(WEST))
    1.10 +				//{
    1.11 +				//	getNeighborPatch(WEST)->mVObjp->dirtyGeom();
    1.12 +				//}
    1.13 +				//if (getNeighborPatch(SOUTH))
    1.14 +				//{
    1.15 +				//	getNeighborPatch(SOUTH)->mVObjp->dirtyGeom();
    1.16 +				//}
    1.17 +				LLSurfacePatch* neighbor = getNeighborPatch(WEST);
    1.18 +				if (neighbor && neighbor->mVObjp.notNull())
    1.19  				{
    1.20 -					getNeighborPatch(WEST)->mVObjp->dirtyGeom();
    1.21 +					neighbor->mVObjp->dirtyGeom();
    1.22  				}
    1.23 -				if (getNeighborPatch(SOUTH))
    1.24 +				neighbor = getNeighborPatch(SOUTH);
    1.25 +				if (neighbor && neighbor->mVObjp.notNull())
    1.26  				{
    1.27 -					getNeighborPatch(SOUTH)->mVObjp->dirtyGeom();
    1.28 +					neighbor->mVObjp->dirtyGeom();
    1.29  				}
    1.30 +				// </FS:Ansariel>
    1.31  			}
    1.32  		}
    1.33  		mVisInfo.mbIsVisible = TRUE;

mercurial