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

Changes to assist in building on Linux, more attempts at stopping OpenJPEG(?) related crashes, disabled being logged out for going AFK by default.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-28 02:22:41 -04:00
parent e91444a907
commit 9d1073ac40
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/develop.py
View File

@@ -73,10 +73,10 @@ class PlatformSetup(object):
for t in ('Debug', 'Release', 'RelWithDebInfo'): for t in ('Debug', 'Release', 'RelWithDebInfo'):
build_types[t.lower()] = t build_types[t.lower()] = t
build_type = build_types['relwithdebinfo'] build_type = build_types['release']
standalone = 'OFF' standalone = 'OFF'
unattended = 'OFF' unattended = 'OFF'
project_name = 'SecondLife' project_name = 'Ascent'
distcc = True distcc = True
cmake_opts = [] cmake_opts = []
word_size = 32 word_size = 32

1
indra/llimage/llimagej2c.cpp
View File

@@ -484,6 +484,7 @@ BOOL LLImageJ2C::validate(U8 *data, U32 file_size)
{ {
if (mImpl) if (mImpl)
res = mImpl->getMetadata(*this); res = mImpl->getMetadata(*this);
else res = FALSE;
} }
} }

2
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -114,6 +114,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
// FIXME: Get the comment field out of the texture // FIXME: Get the comment field out of the texture
// //
if (!base.getData()) return FALSE; if (!base.getData()) return FALSE;
if (!base.getDataSize()) return FALSE;
LLTimer decode_timer; LLTimer decode_timer;
@@ -419,6 +420,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
// FIXME: We get metadata by decoding the ENTIRE image. // FIXME: We get metadata by decoding the ENTIRE image.
// //
if (!base.getData()) return FALSE; if (!base.getData()) return FALSE;
if (!base.getDataSize()) return FALSE;
// Update the raw discard level // Update the raw discard level
base.updateRawDiscardLevel(); base.updateRawDiscardLevel();

2
indra/newview/linux_tools/wrapper.sh
View File

@@ -115,7 +115,7 @@ if [ -n "$LL_TCMALLOC" ]; then
fi fi
fi fi
export VIEWER_BINARY='snowglobe-do-not-run-directly' export VIEWER_BINARY='Ascent-do-not-run-directly'
export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY' export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY'
export SL_OPT="`cat gridargs.dat` $@" export SL_OPT="`cat gridargs.dat` $@"

2
indra/newview/llappviewer.cpp
View File

@@ -222,7 +222,7 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
F32 gSimLastTime; // Used in LLAppViewer::init and send_stats() F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
F32 gSimFrames; F32 gSimFrames;
BOOL gAllowIdleAFK = TRUE; BOOL gAllowIdleAFK = FALSE;
BOOL gAllowTapTapHoldRun = TRUE; BOOL gAllowTapTapHoldRun = TRUE;
BOOL gShowObjectUpdates = FALSE; BOOL gShowObjectUpdates = FALSE;
BOOL gUseQuickTime = TRUE; BOOL gUseQuickTime = TRUE;

18
indra/newview/viewer_manifest.py
View File

@@ -125,7 +125,7 @@ class ViewerManifest(LLManifest):
def installer_prefix(self): def installer_prefix(self):
mapping={"secondlife":'SecondLife_', mapping={"secondlife":'SecondLife_',
"snowglobe":'Snowglobe_', "snowglobe":'Snowglobe_',
"Inertia":'Inertia_'} "Ascent":'Ascent_'}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def flags_list(self): def flags_list(self):
@@ -547,13 +547,13 @@ class DarwinManifest(ViewerManifest):
def app_name(self): def app_name(self):
mapping={"secondlife":"Second Life", mapping={"secondlife":"Second Life",
"snowglobe":"Snowglobe", "snowglobe":"Snowglobe",
"Inertia":"Intertia"} "Ascent":"Ascent"}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def info_plist_name(self): def info_plist_name(self):
mapping={"secondlife":"Info-SecondLife.plist", mapping={"secondlife":"Info-SecondLife.plist",
"snowglobe":"Info-Snowglobe.plist", "snowglobe":"Info-Snowglobe.plist",
"Inertia":"Info-Inertia.plist"} "Ascent":"Info-Ascent.plist"}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def package_finish(self): def package_finish(self):
@@ -692,19 +692,19 @@ class LinuxManifest(ViewerManifest):
def wrapper_name(self): def wrapper_name(self):
mapping={"secondlife":"secondlife", mapping={"secondlife":"secondlife",
"snowglobe":"snowglobe", "snowglobe":"snowglobe",
"Inertia":"inertia"} "Ascent":"Ascent"}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def binary_name(self): def binary_name(self):
mapping={"secondlife":"do-not-directly-run-secondlife-bin", mapping={"secondlife":"Ascent-do-not-run-directly",
"snowglobe":"snowglobe-do-not-run-directly", "snowglobe":"Ascent-do-not-run-directly",
"Inertia":"inertia-do-not-run-directly"} "Ascent":"Ascent-do-not-run-directly"}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def icon_name(self): def icon_name(self):
mapping={"secondlife":"secondlife_icon.png", mapping={"secondlife":"secondlife_icon.png",
"snowglobe":"snowglobe_icon.png", "snowglobe":"snowglobe_icon.png",
"Inertia":"inertia_icon.png"} "Ascent":"Ascent_icon.png"}
return mapping[self.viewer_branding_id()] return mapping[self.viewer_branding_id()]
def package_finish(self): def package_finish(self):
@@ -720,7 +720,7 @@ class LinuxManifest(ViewerManifest):
else: else:
installer_name += '_' + self.channel_oneword().upper() installer_name += '_' + self.channel_oneword().upper()
installer_name = 'Inertia' installer_name = 'Ascent'
# Fix access permissions # Fix access permissions
self.run_command(""" self.run_command("""