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

Whole bunch of crash fixes and compiler junk.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-29 00:40:22 -04:00
parent 5fc9867f8b
commit ae4dcc283c
5 changed files with 502 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/develop.py
View File

@@ -656,7 +656,7 @@ class WindowsSetup(PlatformSetup):
continue continue
vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
' --solution ' + ' --solution ' +
os.path.join(build_dir,'SecondLife.sln') + os.path.join(build_dir,'Ascent.sln') +
' --config ' + self.build_type + ' --config ' + self.build_type +
' --startup secondlife-bin') ' --startup secondlife-bin')
print 'Running %r in %r' % (vstool_cmd, getcwd()) print 'Running %r in %r' % (vstool_cmd, getcwd())

4
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -115,6 +115,8 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
// //
if (!base.getData()) return FALSE; if (!base.getData()) return FALSE;
if (!base.getDataSize()) return FALSE; if (!base.getDataSize()) return FALSE;
if (!raw_image.getData()) return FALSE;
if (!raw_image.getDataSize()) return FALSE;
LLTimer decode_timer; LLTimer decode_timer;
@@ -156,6 +158,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
/* decode the stream and fill the image structure */ /* decode the stream and fill the image structure */
if (!cio) return FALSE; if (!cio) return FALSE;
if (cio->bp == NULL) return FALSE;
if (!dinfo) return FALSE; if (!dinfo) return FALSE;
image = opj_decode(dinfo, cio); image = opj_decode(dinfo, cio);
@@ -466,6 +469,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
/* decode the stream and fill the image structure */ /* decode the stream and fill the image structure */
if (!cio) return FALSE; if (!cio) return FALSE;
if (cio->bp == NULL) return FALSE;
if (!dinfo) return FALSE; if (!dinfo) return FALSE;
image = opj_decode(dinfo, cio); image = opj_decode(dinfo, cio);

8
indra/newview/viewer_manifest.py
View File

@@ -163,13 +163,13 @@ class WindowsManifest(ViewerManifest):
def final_exe(self): def final_exe(self):
if self.default_channel() and self.viewer_branding_id()=="secondlife": if self.default_channel() and self.viewer_branding_id()=="secondlife":
if self.default_grid(): if self.default_grid():
return "SecondLife.exe" return "Ascent.exe"
else: else:
return "SecondLifePreview.exe" return "Ascent.exe"
elif(self.viewer_branding_id=="snowglobe"): elif(self.viewer_branding_id=="snowglobe"):
return "Snowglobe.exe" return "Ascent.exe"
else: else:
return ''.join(self.channel().split()) + '.exe' return 'Ascent.exe'
def construct(self): def construct(self):