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

Build fix for that

Browse Source
This commit is contained in:
Siana Gearz
2011-08-03 23:16:00 +02:00
parent e70bc6b800
commit 39b18cd2ca
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/CMakeLists.txt
View File

@@ -1232,6 +1232,7 @@ set_source_files_properties(${viewer_XUI_FILES}
list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
set(viewer_APPSETTINGS_FILES set(viewer_APPSETTINGS_FILES
viewer_manifest.py
app_settings/anim.ini app_settings/anim.ini
app_settings/cmd_line.xml app_settings/cmd_line.xml
app_settings/grass.xml app_settings/grass.xml

18
indra/newview/llviewerparcelmgr.cpp
View File

@@ -138,16 +138,16 @@ LLViewerParcelMgr::LLViewerParcelMgr()
mHoverParcel = new LLParcel(); mHoverParcel = new LLParcel();
mCollisionParcel = new LLParcel(); mCollisionParcel = new LLParcel();
mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c"); mBlockedImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrylines.j2c");
mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c"); mPassImage = LLViewerTextureManager::getFetchedTextureFromFile("noentrypasslines.j2c");
init(256); init(256);
} }
//moved this stuff out of the constructor and into a function that we can call again after we get the 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 //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) //on a single grid properly - Patrick Sapinski (2/10/2011)
void LLViewerParcelMgr::init(F32 region_size) void LLViewerParcelMgr::init(F32 region_size)
{ {
mParcelsPerEdge = S32( REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS ); mParcelsPerEdge = S32( REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS );
mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)]; mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
@@ -1365,7 +1365,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
return; return;
} }
S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge; //S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge;
S32 expected_size = 1024; S32 expected_size = 1024;
if (packed_overlay_size != expected_size) if (packed_overlay_size != expected_size)
{ {