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

Merge branch 'future'

Browse Source
This commit is contained in:
TighMacFanatic
2011-09-24 22:36:40 -04:00
parent 3853d50eec 9b0723ec8d
commit 00699801d2
1001 changed files with 46799 additions and 16555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llsurface.cpp
View File

@@ -176,6 +176,7 @@ void LLSurface::create(const S32 grids_per_edge,
mNumberOfPatches = mPatchesPerEdge * mPatchesPerEdge;
mMetersPerGrid = width / ((F32)(mGridsPerEdge - 1));
mMetersPerEdge = mMetersPerGrid * (mGridsPerEdge - 1);
sTextureSize = width;
mOriginGlobal.setVec(origin_global);
@@ -339,17 +340,28 @@ void LLSurface::setOriginGlobal(const LLVector3d &origin_global)
}
}
void LLSurface::getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions )
{
S32 i;
for (i = 0; i < 8; i++)
{
if ( mNeighbors[i] != NULL )
{
uniqueRegions.push_back( mNeighbors[i]->getRegion() );
}
}
}
void LLSurface::connectNeighbor(LLSurface *neighborp, U32 direction)
{
S32 i;
LLSurfacePatch *patchp, *neighbor_patchp;
if (gNoRender)
{
return;
}
S32 i;
LLSurfacePatch *patchp, *neighbor_patchp;
mNeighbors[direction] = neighborp;
neighborp->mNeighbors[gDirOpposite[direction]] = this;