Commit Graph

2374 Commits

Author SHA1 Message Date
Lirusaito
1f7ed035d3 Make translation more flexible
Also in this commit, unrelated updates to the building panel (so git sees the markup "just" move in my next commit)
2012-09-29 16:59:17 -04:00
Lirusaito
f311852e9b Satiate Issue 474 by showing a more sensible number for ARC by default.
http://code.google.com/p/singularity-viewer/issues/detail?id=474
Adds LiruSensibleARC debug setting, defaults to true.
Code ported from Imprudence.
2012-09-28 20:13:38 -04:00
Lirusaito
cb33470673 Strings fix-up~ 2012-09-25 16:02:17 -04:00
Lirusaito
cb0c13a1a1 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2012-09-23 10:25:22 -04:00
Lirusaito
2581935b36 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/floater_post_process.xml - Used Mine, because Shyotl's is the ancient one from "the before time" and because my last commit (worked on motionblur tab, then, too.)
2012-09-22 15:12:45 -04:00
Shyotl
9bb9292a41 Attempt to catch octree node manipulation while iterating over said nodes 2012-09-19 15:34:25 -05:00
Shyotl
438c499718 And the shader.. 2012-09-19 15:34:15 -05:00
Shyotl
ff81d9461a Added motionblur postprocess shader.
Conflicts:

	indra/newview/skins/default/xui/en-us/floater_post_process.xml
2012-09-19 15:33:58 -05:00
Shyotl
f4f85aa1fd Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Conflicts:
	indra/newview/llviewerobject.cpp
2012-09-19 15:24:33 -05:00
Lirusaito
d7da5153f3 Fixed up the Post-Process floater~
Vertical tabs, as requested by Shyotl
2012-09-18 10:06:21 -04:00
Drake Arconis
a09f7d274f Fixed a bit of cmake derpyness 2012-09-17 22:23:57 -04:00
Drake Arconis
efb252206b Cached controls in cmdline chatbar 2012-09-17 22:22:02 -04:00
Drake Arconis
ffb847bbc0 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-16 16:40:49 -04:00
Siana Gearz
b0ea103c61 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-09-15 17:05:50 +02:00
Siana Gearz
65781e6080 Make label 'Multiple' click through in texture selector 2012-09-15 08:36:38 +02:00
Siana Gearz
fc0149cdbc Fix the Unlink button 2012-09-15 08:16:35 +02:00
Siana Gearz
3946c076fe Oh i love our Coyotl 2012-09-15 07:34:06 +02:00
Lirusaito
10f09dc15d Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-14 05:42:46 -04:00
Drake Arconis
f50d23a0d4 Fast Timers brought up to linden equiv 2012-09-14 00:30:52 -04:00
Shyotl
53fd33604d Apparently blendstate needs to be set back to alpha after finishing drawing wireframe. 2012-09-14 03:42:16 +02:00
Shyotl
8f9c8ee293 Disabled reundant mesh wireframe passes. Outline wireframe pass not needed if sRenderHiddenSelections is set. Also enabled backface culling for outline pass. While these changes do improve performance a bit, they also seem to fix an atioglxx.dll crash (driver bug?) 2012-09-14 02:49:28 +02:00
Shyotl
767fe92de5 Invisprims in deferred now bind the correct shader when being drawn. (Fixes vbo attrib errors) 2012-09-14 02:45:22 +02:00
Shyotl
afc7c2b449 Better robustness when loading shaders. Redundant shaders (eg: "deferred/shadowF.glsl") will only need to be compiled once, and LLShaderMgr::mShaderObjects won't have previous entries mistakenly overwritten as a result. 2012-09-14 02:33:07 +02:00
Drake Arconis
e0a7c7e935 Renamed our log files to not conflict with linden 2012-09-13 19:39:02 -04:00
Drake Arconis
b7ff2fe3e3 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2012-09-13 18:09:46 -04:00
Siana Gearz
7978f5ebfe Rebuild drawable when alpha changes 2012-09-13 06:38:36 +02:00
Lirusaito
b663110288 Fix Sound Upload not working
Was broken by a change in f77f846c8d
Thanks to Lucia TopHat and Tazy Scientist for helping me test and confirm all this.
2012-09-12 08:23:42 -04:00
Siana Gearz
3ef9e3bc69 Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2012-09-11 20:18:05 +02:00
Lirusaito
31041f2ade Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-11 09:45:17 -04:00
Siana Gearz
4ade726a07 Fix PATH-842 rotation reset on object update 2012-09-10 16:31:27 +02:00
Siana Gearz
856a45a775 Crash stopgaps from FS 2012-09-10 02:51:03 +02:00
Siana Gearz
f64ccbab7e Scrollable fast timer view, by Liny 2012-09-10 02:36:37 +02:00
Siana Gearz
8a44c8fce1 Fast timer fix-up
The logic is incorrect in principle, but at least it's better behaved now.
Also, get fast timer out of important parts of aistatemachine.
2012-09-10 02:06:07 +02:00
Siana Gearz
2a70dde016 Start voice with mic muted 2012-09-08 09:49:12 +02:00
Siana Gearz
f1a5fb6b62 Fix LightShare annoyance for people who don't know what LightShare is 2012-09-08 08:12:13 +02:00
Siana Gearz
04bb15a108 Fix anti-aliasing in FBO mode 2012-09-08 08:09:30 +02:00
Drake Arconis
86ad4aabf3 Cmake changes needed for standalone 2012-09-07 17:53:13 -04:00
Siana Gearz
fef681be7c Fix annoyance in debug build on OpenSim 2012-09-04 12:54:47 +02:00
Siana Gearz
e379a5a03e Allow super thin objects on OpenSim 2012-09-04 12:37:22 +02:00
Lirusaito
f2b4911f60 Space, the final frontier 2012-09-02 15:41:14 -04:00
Lirusaito
ff93de6e61 Fix for P2P Voice Volume slider overlapping End call button. 2012-09-02 14:38:49 -04:00
Siana Gearz
29adc28d80 ivec4 still needed as texture index on some SONY VAIO and Toshiba ATI drivers.
This reverts commit b8b235df09.
2012-09-02 19:26:28 +02:00
Shyotl
6ec4c65f04 A few nullchecks, and removal of pointless uint < 0 bounds checks. 2012-09-02 08:48:52 +02:00
Shyotl
fefb40bda2 MAINT-675: Fix for DoF focal point being incorrect when alt-zooming on terrain. http://hg.secondlife.com/viewer-development/changeset/4e362886866692fa904a88adcf3e11b7518802f3 2012-09-02 08:47:20 +02:00
Shyotl
c5938f7d31 Removed prim joint logic. (Dead code) 2012-09-02 08:47:03 +02:00
Shyotl
e748b74c67 Hook floater with primary focus(and is therefore opaque) into the occlusion system. 2012-09-02 08:46:21 +02:00
Lirusaito
37a9a52544 Improve on translation in llviewermessage.cpp
More sync with v-d for llviewermessage.cpp
space changes mostly
2012-09-02 02:30:38 -04:00
Siana Gearz
566d70a6d1 Restore applying anti-aliasing from preferences 2012-09-02 06:39:50 +02:00
Lirusaito
7b7157f491 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-01 10:08:29 -04:00
Lirusaito
ea8791697e Sync more code with upstream, Translations galore, even translations for AntiSpam!
Updated AntiSpam with documentation, safety measures, and better presentations and clarifications for the end-user from FS.
If it looks like something was removed from an xml, it was just moved to fall into place better with v-d.

Corrected log end message being log start message.
2012-09-01 00:43:30 -04:00