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

Merge branch 'master' of git://github.com/lkalif/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2013-02-17 15:36:59 +01:00
parent 49c872c86d e83befcb6b
commit 0f54a2777e
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsingleton.h
View File

@@ -226,7 +226,7 @@ void LLSingleton<DERIVED_TYPE>::createInstance(SingletonInstanceData& data)
if (data.mInitState == INITIALIZING)
{
llwarns << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
lldebugs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
return;
}

2
indra/newview/app_settings/settings_rlv.xml
View File

@@ -209,7 +209,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>RLVaWearReplaceUnlocked</key>
<map>

2
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -52,7 +52,7 @@
<check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" initial_value="true" label="Atmospheric shaders" left_delta="0" name="WindLightUseAtmosShaders"/>
<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Advanced Lighting Model" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
<check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
<check_box bottom_delta="-17" control_name="RenderDepthOfField" initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
<text bottom_delta="-17" height="12" left="15" name="TerrainScaleText">Terrain Scale:</text>

1
indra/newview/viewer_manifest.py
View File

@@ -861,6 +861,7 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libexpat.so*")
self.path("libglod.so")
self.path("libhunspell-1.3.so*")
self.path("libpcre.so.3");
self.path("libminizip.so.1.2.3", "libminizip.so");
self.path("libssl.so*")
self.path("libuuid.so*")

8
install.xml
View File

@@ -1075,16 +1075,16 @@
<key>linux</key>
<map>
<key>md5sum</key>
<string>3372b361e916df8981cb3bd7393b0353</string>
<string>a561ed0ef937f3086ba3f84f2e59b1b2</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20110504.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20130216.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>be0a9c92b5ab7d6761574b61685d6300</string>
<string>272bd861a7ff9f77e6908064cf52e4cf</string>
<key>url</key>
<uri>https://bitbucket.org/Siana/singularityviewer/downloads/pcre-7.6-linux-x86_64-20120715.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux64-20130216.tar.bz2</uri>
</map>
</map>
</map>