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

3059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleric Inglewood
e3460bea09 Compile fix for openssl < 1.0.1 2012-09-11 15:51:18 +02: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
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
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
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
Shyotl
a957d58939 SH-3238: Textures are loaded at lower detail on subsequent log-ins. http://hg.secondlife.com/viewer-development/changeset/e9975f600436ab692e541662bcadfa7a04c97e1d 2012-09-02 08:44:25 +02:00
Siana Gearz
566d70a6d1 Restore applying anti-aliasing from preferences 2012-09-02 06:39:50 +02:00
Aleric Inglewood
dd9f7bba5d Merge branch 'curlthreading2' of github.com:AlericInglewood/SingularityViewer into curlthreading2 2012-09-01 04:02:45 +02:00
Aleric Inglewood
8051cd4194 Install fix for latest 32bitcompatibilitylibs 2012-09-01 03:56:52 +02:00
Siana Gearz
b4a7fa1ad9 Force Vorbis to link before FMODEx 2012-09-01 03:10:26 +02:00
Siana Gearz
e460bd9a69 Yet another attempt at getting old ATI drivers not to do all pink 2012-09-01 01:35:35 +02:00
Siana Gearz
5a3082275e Fix object update on OpenSim regions with mesh disabled 2012-08-31 19:55:49 +02:00
Siana Gearz
bdf20355b6 Added OSGrid 2012-08-31 06:36:47 +02:00
Aleric Inglewood
21ea923520 Compile fix for OSX 2012-08-31 05:50:42 +02:00
Aleric Inglewood
484fff444f Compile fix for OSX 2012-08-31 05:23:20 +02:00
Siana Gearz
f63d0abbc1 Fix multi-preview for textures 2012-08-30 14:03:27 +02:00
Siana Gearz
5a05898ec4 Callum Linden's tcmalloc 2012-08-30 08:38:56 +02:00
Siana Gearz
03ee96cdff Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-08-30 04:49:41 +02:00
Siana Gearz
be2598bc4c Attempt to fix effect shaders 2012-08-30 02:58:50 +02:00
Lirusaito
01f5fe6eb1 Restore object rotation code to fix Issue 454 
Just a partial revert of aca3e8f6c4
_PREHASH_ObjectRotation and sendRotationUpdate
 2012-08-29 13:34:27 -04:00
Siana Gearz
32f9cbb11d Revert "MAINT-646: Hotspot in LLViewerObjectList::update" 
This reverts commit d8fc691625.
 2012-08-27 07:32:29 +02:00
Damian Zhaoying
67e99c799c Add new panel_navmesh_rebake.xml file and erase floater_hex.xml file from spanish language files 2012-08-26 06:11:40 -03:00
Damian Zhaoying
da5284c6b8 Fix and update some spanish translations 2012-08-26 06:01:35 -03:00
Damian Zhaoying
c2fa79347e Merge remote-tracking branch 'upstream/master' 2012-08-26 05:53:32 -03:00
Siana Gearz
953a7ff066 Fix growth of linker flags on windows 2012-08-26 08:12:23 +02:00
Lirusaito
84cabd6a1e Added Nomade's SecondLove skin 2012-08-25 16:23:29 -04:00
Siana Gearz
e1a6b7e249 Correct a whoopsie there 2012-08-25 19:41:34 +02:00
Damian Zhaoying
72b342912e Merge remote-tracking branch 'upstream/master' 2012-08-24 17:07:02 -03:00
Lirusaito
07f52c463e Fixed crash reported by Naudia Nadezda, crash when closing a texture multipreview. 
Also updated LLPreviewTexture to be closer to upstream and better for translation,
added lltrans for FileSaved and Receiving,
and floater_preview_texture.xml now uses No Alpha, Has Alpha, Unknown as strings.
 2012-08-23 23:53:36 -04:00
Lirusaito
064f0216b4 Disable Newline AntiSpam when AntiSpam is not enabled. 2012-08-23 18:55:57 -04:00
Lirusaito
70a4d113b3 Fix placement of the History Button having spacing when Voice is Disabled. 2012-08-23 18:55:20 -04:00
Lirusaito
2001d6b6ec Skins update, enter Nomade's (cleaned up) skins! 
Fixed all skins to use DefaultListText properly.
Fixed white_emerald to use textures directory instead of Textures directory.
 2012-08-23 18:51:40 -04:00