Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,067 Commits 20 Branches 51 Tags
09965b0cdfd12062aee06b5bb08f26835cf28c19
Commit Graph

4067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drake Arconis
7af331c50d First set of changes for new librarys and lib layout support! 
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
 2012-07-04 00:26:42 +00:00
Aleric Inglewood
125a10bb44 Code hardening, review, bug fixes, documentation, curl stats and cleanup. 
Bug fixes:
AICurlEasyRequestStateMachine didn't delete itself.
curl_multi_socket_action calls were made for potentional removed sockets.
The curl thread wasn't terminated.
 2012-07-04 00:10:43 +02:00
Lirusaito
de26fff525 Changed "Mesh Detail" to "Level of Detail" so people don't see it as "Mesh" 
Also added in an Advanced button, but it's commented out as it does not function properly, and someone else should code it..
Builds on the previous commit of graphics prefs..
 2012-07-03 14:44:13 -04:00
Drake Arconis
9db7bcde00 Why or why ugly hack :/ 2012-07-03 17:33:37 +00:00
Lirusaito
ca9c99577f Removed exportFileXML, and importXML, updated indra/test's 
and generally updated cpp's to V-D look(include order, spelling fixes, and whatnot)
Also, commented out pointless using namespace std.
 2012-07-03 10:07:14 -04:00
Lirusaito
b0c28c5eb2 Updated Graphics Preferences, Fixed display resolution combobox not disappearing 
Now includes Ambient Occlusion and looks more like V3,
and yay everything finally disappears that should nao~
 2012-07-03 09:55:19 -04:00
Lirusaito
ded9d1027b Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-03 08:44:10 -04:00
Aleric Inglewood
9b8e5c8719 Merge branch 'V2MultiWear' into curlthreading2 
I picked a few non-curl related patches from curlthreading2
and applied them to V2MultiWear. Now merging back to avoid
collisions for others.
 2012-07-03 14:27:12 +02:00
Siana Gearz
8a271b9621 HTTP texture fix - the brutal and inefficient way -.- 2012-07-03 13:40:32 +02:00
Siana Gearz
c5f9e8cf68 Revert "HTTP texture fetch endless append fix, by Laika Tungsten" 
This reverts commit b4bdb7ca36.
 2012-07-03 13:17:01 +02:00
Lirusaito
4e2af85770 Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
 2012-07-03 01:57:55 -04:00
Siana Gearz
5a685febbf Certificate update 2012-07-03 07:51:03 +02:00
Siana Gearz
cd2dc2f3ca Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/app_settings/settings.xml
	indra/newview/llface.cpp
 2012-07-03 07:49:22 +02:00
Lirusaito
9c61998dac Spelling fixes... 
to a header *sigh*
 2012-07-03 00:54:25 -04:00
Lirusaito
509340237c Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear 2012-07-03 00:51:43 -04:00
Drake Arconis
fc3436a8d1 *grumble* 2012-07-03 04:48:30 +00:00
Drake Arconis
41983b7f27 A bit of cleanup and fixes 2012-07-03 04:45:53 +00:00
Lirusaito
a9494d1fb0 Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear 2012-07-02 23:42:38 -04:00
Drake Arconis
608417ba6b Corrected line endings of XML files 2012-07-03 03:32:18 +00:00
Drake Arconis
c5d19cca0b Finished dead code patrol and cleaned up remnants of long dead feature 2012-07-03 03:31:24 +00:00
Lirusaito
4435e7ade3 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-02 21:28:19 -04:00
Drake Arconis
f79a16ef0f Cleanup of long dead code 2012-07-03 01:10:41 +00:00
Drake Arconis
947990c2ad Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-03 00:34:07 +00:00
Aleric Inglewood
e36042bb76 More that I forgot it extract from curlthreading2. 2012-07-03 02:33:09 +02:00
Drake Arconis
cb5474c291 Cleanup and simplication of cmake logic in 00-Common.cmake 2012-07-03 00:31:06 +00:00
Drake Arconis
77948b8ce4 Fixed further warnings reported by clang. 2012-07-03 00:24:15 +00:00
Drake Arconis
2ac4f81424 Prefer FmodEx as the default audio engine if the viewer was built with it. 2012-07-03 00:22:50 +00:00
Drake Arconis
7ad1b8731d Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:25:40 +00:00
Aleric Inglewood
d66acdf240 Add the rest of sRunning too. 2012-07-02 23:22:42 +02:00
Drake Arconis
8eb319d3ba Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:08:04 +00:00
Drake Arconis
d703b4e076 Further tweaking cmake 2012-07-02 21:04:53 +00:00
Shyotl
9ddbc132bf View->Build menu selection now functions once more. 2012-07-02 15:38:38 -05:00
Drake Arconis
c464a8da30 Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers 
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
 2012-07-02 20:16:56 +00:00
Lirusaito
e6689f830a Update llstring, and fix an error only presented in debug builds. 2012-07-02 15:57:55 -04:00
Drake Arconis
ece9dda7b4 Initial support for the Clang compiler and numerous warning fixes 2012-07-02 19:45:41 +00:00
Lirusaito
361c69edd9 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-02 15:35:26 -04:00
Shyotl
d0668d818c Cmake was setting a certain preprocessor definition when it shouldn't have been(Because I made a silly mistake). 2012-07-02 14:30:28 -05:00
Lirusaito
24db228406 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
 2012-07-02 04:14:52 -04:00
Shyotl
53a570b977 Push drawables into priority queue when their textures change number of components. (Quick and dirty fix for alpha faces not being placed into alpha pool until some other irrelivant rebuild state is set) 2012-07-02 00:50:55 -05:00
Aleric Inglewood
a803507d67 Use correct way to check if we logged in yet or not. 
Without this fix, we trigger an assert, in debug mode, that was added
to Singularity exactly to find out if we called functions like
getExpandedFilename(LL_PATH_PER_SL_ACCOUNT ...) before logging in.
Checking if THAT function returns empty() is clearly not safe, but
very error prone.
 2012-07-01 22:15:03 +02:00
Shyotl
4ba1509371 Texcache tweakage. 2012-06-30 20:07:52 -05:00
Shyotl
399d93cc36 Compiler fixes and a crashfix. 2012-06-30 20:06:48 -05:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Aleric Inglewood
cb5efad026 Turn llassert[_always] into a (single) statement and print line nr in decimal. 2012-06-30 21:14:18 +02:00
Aleric Inglewood
26922a1578 Merge remote-tracking branch 'lirusaito/curlthreading2' into curlthreading2 2012-06-29 05:28:58 +02:00
Aleric Inglewood
90493b6571 Add support for libopenSSL older than version 1.0.0. 2012-06-29 05:20:24 +02:00
Aleric Inglewood
2dee921cd5 Fix libcurl version check. 2012-06-29 01:33:38 +02:00
Lirusaito
433c7c3f99 Spelling fixes and stuff like that to AICurl* and llproxy.* documentations 
Also removes a duplicate include from llares.cpp

Conflicts:
	indra/llmessage/aicurl.cpp
 2012-06-28 04:08:25 -04:00
Lirusaito
fef461fd13 Grabbed openSSL-1.0.0d from upstream for linux, necessary for non-standalone compiles. 
Also brought in linux64 version I had sitting around, collecting dust.
 2012-06-28 03:46:22 -04:00
Aleric Inglewood
1f56645b69 Always set proxy settings for every HTTP curl connection. 
Move applyProxySettings to CurlEasyRequest and call it from
applyDefaultOptions.

Use AIThreadSafe for LLProxy for a more robust threadsafeness.
(This forces correct locking, checks that the unshared vars
are indeed unshared and made it easy to use read/write locking,
which might be important in this case (we do a lot of read-only
accesses to it).
 2012-06-28 05:56:21 +02:00