Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,093 Commits 20 Branches 51 Tags
8df7a52cf7f2dbc39cd709ed165a48c0ee60b93e
Commit Graph

3093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
8df7a52cf7 Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer 
Conflicts:
	indra/llplugin/slplugin/CMakeLists.txt
 2012-09-19 23:30:48 +02:00
Aleric Inglewood
19f325aa09 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llcommon/CMakeLists.txt

Resolved with kdiff3 automatically.
 2012-09-19 04:11:16 +02:00
Aleric Inglewood
c67f010302 Pass filename by reference when possible. 2012-09-18 05:01:34 +02:00
Siana Gearz
44b2392a10 Version 1.7.2 1.7.2 2012-09-15 21:33:09 +02:00
Siana Gearz
855540b5c5 Have i beaten you now, evil extortionists? 2012-09-15 21:31:33 +02:00
Siana Gearz
a7b9b0da42 Version 1.7.2 2012-09-15 21:17:16 +02:00
Siana Gearz
5f8eac9dc8 Have i beaten you now, evil extortionists? 2012-09-15 21:15:59 +02: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
Aleric Inglewood
b5b6d3f85c Fix PluginAttachDebuggerToPlugins for linux. 
This fixes the problem that many terminals require command line
parameters to be passed as command line parameters to the terminal
command. The old code would pass the whole gdb command including
all it's arguments (whatever replaces %s) as a single argument,
regardless of whether there are quotes around the %s or not.
Now those arguments are passed as separate arguments if there
are no quotes around the %s.

Updated documentation with an example on how to open a gdb terminal
on a different machines X display.
 2012-09-14 19:38:05 +02:00
Lirusaito
10f09dc15d Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-14 05:42:46 -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
Siana Gearz
c8e3935648 GCC build fix 2012-09-14 02:56:40 +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
435b9cd1bb Including these changes to llglshader might've been a good thing to do a few commits ago. Eups. 2012-09-14 02:44:51 +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
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
Aleric Inglewood
834a524a67 Compile fix. 
This belongs to the latest merge with singu/master.
 2012-09-11 17:03:57 +02:00
Aleric Inglewood
e3460bea09 Compile fix for openssl < 1.0.1 2012-09-11 15:51:18 +02:00
Lirusaito
31041f2ade Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-09-11 09:45:17 -04:00
Lirusaito
3320272673 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-09-11 09:30:25 -04:00
Aleric Inglewood
d23835a6c2 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.
 2012-09-11 15:15:46 +02:00
Aleric Inglewood
d57a3b101b Hide quilt patch directory 2012-09-11 14:54:51 +02:00
Aleric Inglewood
c2289c047b Only disable TLS1.1 for openssl1.0.1 and higher, leaving SSL3 alone. 2012-09-11 02:05:54 +02: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
cry0
9b66d74382 Fixed lscript 
Bison 2.6 caused some problems with indra.l and indra.y
 2012-09-05 21:42:51 -05:00
Aleric Inglewood
e3752aefed Fix loading Qt plugin on linux standalone. 
For standalone there is no need to link libmedia_plugin_webkit.so
against Qt's plugins, and thus also not to add "random" paths
to LD_LIBRARY_PATH. Just let Qt do it's thing and find and
load the plugins it needs itself.
 2012-09-05 19:29:47 +02:00
Aleric Inglewood
d8ff809092 Make webkit work with Qt 4.8 2012-09-05 04:12:13 +02:00
Aleric Inglewood
a8f5bf8baf Bug fix. 
dlerror() returns NULL when no errors have occurred since the last call
to dlerror() (or since the last call to dlopen(), dlsym() or dlclose()).
 2012-09-05 02:15:41 +02:00
Aleric Inglewood
15cce79040 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llmessage/llcurl.cpp

Changes to unused file (I'll remove it when I'm done).
 2012-09-04 17:38:11 +02: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
118937aa99 Fow windows, client is now more likeley to create gl context that actually matches desired multi-sample value. 2012-09-02 08:49:46 +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