Aleric Inglewood
e7cd445491
Merge branch 'curlthreading2' into curlthreading3
2012-09-06 15:12:22 +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
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
Siana Gearz
b278cbb32e
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-08-23 07:26:19 +02:00
Siana Gearz
7ec9af8200
Parcel media crash fix
2012-08-23 07:25:36 +02:00
Lirusaito
71b0c35653
AntiSpam improvements: Less sensitive defaults for sound multi's and an off switch.
...
Polished the Spam tab a bit...
Also, slightly better errors for antispam bugs... Which Ruby neglected to take from me...
2012-08-23 00:12:09 -04:00
Damian Zhaoying
4032df3115
Merge remote-tracking branch 'upstream/master'
2012-08-22 11:44:10 -03:00
Lirusaito
6eadc29ca0
Polish About floater Credits tabs, and remove translation of Credits and Licenses tabs.
2012-08-21 18:39:55 -04:00
Lirusaito
c6f7a39d22
A tiny sync with v-d in LLGLSandBox/LLViewerParcelMgr
2012-08-21 16:49:44 -04:00
Siana Gearz
73099edae3
Version 1.7.1
2012-08-21 22:06:23 +02:00
Siana Gearz
f53646764c
Merge git://github.com/TighMacFanatic/SingularityViewer
2012-08-21 22:01:46 +02:00
Siana Gearz
7b42fea0f5
Stricter git
2012-08-21 19:17:45 +02:00
Siana Gearz
df1e9732d0
Developers, profile thy profiler!
2012-08-21 07:43:47 +02:00
Siana Gearz
822ba4432f
Typo fix and MeshMaxConcurrentRequest bumped by demand
2012-08-21 07:43:00 +02:00
TighMacFanatic
8e6c6acf18
Fix issue preventing the spinner/copy/paste from working for position when editting attachments.
2012-08-20 23:54:03 -04:00
Aleric Inglewood
83b13f6a3f
WIP: make everything use AICurlEasyRequestStateMachine
2012-08-20 21:18:19 +02:00
Siana Gearz
aceb3f3425
Fix playback of streams with über-long header, thx to Brett@FMOD
2012-08-20 16:09:55 +02:00
Siana Gearz
37f2ec2f9f
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-08-20 05:16:17 +02:00
Shyotl
4d1e822de7
Fixed ancient annoyance of enabling any debug info display clobbering object hovertext. Object's real hovertext is now cached, and only substituted if overridden by setDebugText, and is properly recovered when debug text is cleared.
2012-08-20 05:10:29 +02:00
Shyotl
b8276fd8e3
MAINT-685: Fix for disabling basic shaders making high detail terrain render incorrectly. http://hg.secondlife.com/viewer-development/changeset/218a7b78dcc5f53f38de063f3a229a7462fe052f
2012-08-20 05:10:15 +02:00
Siana Gearz
d319ebc0a8
Shift-crouch-toggle is now a setting
2012-08-20 05:05:39 +02:00
Siana Gearz
5f32d9347d
Place region console where people expect to find it
2012-08-20 04:41:49 +02:00
Siana Gearz
ba136fe42d
Remove annoying sim version change notification - like viewer 2
2012-08-20 04:22:26 +02:00