Permalink
Browse files

Merge https://github.com/Lirusaito/SingularityViewer/tree/Release

# Conflicts:
#	indra/newview/app_settings/settings_sh.xml
  • Loading branch information...
Shyotl committed Mar 28, 2017
2 parents 97a6f3a + 0dfef2a commit f95be54bd5e10bdb7a83f16406ec78a3b0e1d74e
Showing with 9,187 additions and 79 deletions.
  1. +1 −0 indra/llrender/llpostprocess.cpp
  2. +1 −1 indra/newview/app_settings/settings.xml
  3. +1 −1 indra/newview/app_settings/settings_ascent.xml
  4. +807 −2 indra/newview/app_settings/windlight/postprocesseffects.xml
  5. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml
  6. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml
  7. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml
  8. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml
  9. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml
  10. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
  11. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
  12. +141 −0 indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
  13. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml
  14. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml
  15. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml
  16. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml
  17. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml
  18. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml
  19. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml
  20. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
  21. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Black.xml
  22. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Dark%20H%2DBomb.xml
  23. +31 −31 indra/newview/app_settings/windlight/skies/Ambient%20Dark.xml
  24. +141 −0 indra/newview/app_settings/windlight/skies/Ambient%20Gray.xml
  25. +36 −36 indra/newview/app_settings/windlight/skies/Ambient%20White.xml
  26. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Afternoon.xml
  27. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Dawn.xml
  28. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood.xml
  29. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Day%20Mood2.xml
  30. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Fog.xml
  31. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Ghost.xml
  32. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning.xml
  33. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Morning2.xml
  34. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%2010am.xml
  35. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%204%3A30am.xml
  36. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20END.xml
  37. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am%20START.xml
  38. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%205am.xml
  39. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%207%3A30pm.xml
  40. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208%3A30am.xml
  41. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%208am.xml
  42. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Dark%20START.xml
  43. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Midnight.xml
  44. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Night.xml
  45. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Noon.xml
  46. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20%2DA.xml
  47. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20A.xml
  48. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20B.xml
  49. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20C.xml
  50. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20D.xml
  51. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20E.xml
  52. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunrise%3A%20F.xml
  53. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20A.xml
  54. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20B.xml
  55. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20C.xml
  56. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Natural%20Sunset%3A%20D.xml
  57. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Nighty%20Fog.xml
  58. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20O%2D6am.xml
  59. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Rise.xml
  60. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Rosy%20Morning.xml
  61. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Dawn.xml
  62. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Sweet%20Morning.xml
  63. +141 −0 indra/newview/app_settings/windlight/skies/Nacon%27s%20Test.xml
  64. +141 −0 indra/newview/app_settings/windlight/skies/wastelands%20bright.xml
  65. +43 −0 indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
  66. +43 −0 indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
  67. +1 −1 indra/newview/pipeline.cpp
  68. +3 −1 indra/newview/skins/default/xui/de/menu_pie_avatar.xml
  69. +1 −0 indra/newview/skins/default/xui/de/menu_pie_object.xml
  70. +5 −2 indra/newview/skins/default/xui/de/menu_pie_self.xml
  71. +36 −4 indra/newview/skins/default/xui/de/strings.xml
@@ -366,6 +366,7 @@ LLPostProcess::LLPostProcess(void) :
parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED);
}
+ // Singu TODO: Make this configurable via settings
if (!mAllEffectInfo.has("default"))
mAllEffectInfo["default"] = LLSD::emptyMap();
@@ -12778,7 +12778,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>RenderDebugGL</key>
<map>
@@ -243,7 +243,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>Default.tga</string>
+ <string>Altocumulus.tga</string>
</map>
<key>AscentPowerfulWizard</key>
<map>
Oops, something went wrong.

0 comments on commit f95be54

Please sign in to comment.