From 8787d37d5cbe9171f168fd8f28651576a572c40b Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 3 Aug 2011 23:16:00 +0200 Subject: [PATCH] Build fix for that --- indra/newview/CMakeLists.txt | 1 + indra/newview/llviewerparcelmgr.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 89cd31abb..62d98582e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1224,6 +1224,7 @@ set_source_files_properties(${viewer_XUI_FILES} list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) set(viewer_APPSETTINGS_FILES + viewer_manifest.py app_settings/anim.ini app_settings/cmd_line.xml app_settings/grass.xml diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 617798d9a..b63c81bfc 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -138,16 +138,16 @@ LLViewerParcelMgr::LLViewerParcelMgr() mHoverParcel = new LLParcel(); mCollisionParcel = new LLParcel(); mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c"); - mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c"); - - init(256); - + mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c"); + + init(256); + } -//moved this stuff out of the constructor and into a function that we can call again after we get the region size. -//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes -//on a single grid properly - Patrick Sapinski (2/10/2011) -void LLViewerParcelMgr::init(F32 region_size) +//moved this stuff out of the constructor and into a function that we can call again after we get the region size. +//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes +//on a single grid properly - Patrick Sapinski (2/10/2011) +void LLViewerParcelMgr::init(F32 region_size) { mParcelsPerEdge = S32( REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS ); mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)]; @@ -1349,7 +1349,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user) return; } - S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge; + //S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge; S32 expected_size = 1024; if (packed_overlay_size != expected_size) {