Commit Graph

2425 Commits

Author SHA1 Message Date
Lirusaito
ca07daebc7 Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer into V2MultiWear 2012-07-08 11:28:31 -04:00
Lirusaito
8ec8acf610 Added Build preferences, like Emerald's. Exposed UI for giving an item with autoresponse
Pulled LLDropTarget into its own files and brought in the callback version so we can use either, whereever we need them, without rewriting them.
This makes code for drag and drop items into boxes easier.

--------Auto-Response--------
Added item box to Adv. Chat, finally you can send autoresponse with item!
Taught to LLViewerMessage to understand this.

------------Build------------
Added in comment labels for more sections of system preferences.
Everything new in the System->Build tab will reset on cancel, except the item, I see no reason to reset an item.
Added in BuildPrefs, and settings like them.
Taught LLToolPlacer how to give creations material type, and size, and ask importtracker to do the rest.
LLViewerObjectList now pings importtracker whenever it notices newly created objects that are ours entirely, so we can exact our will upon them.
Cleaned up most of importtracker code so we can use only the parts we need, and do it well.
Added ObjectPhysicsProperties to message.xml
2012-07-08 11:20:56 -04:00
Aleric Inglewood
5637e89568 Fix for libcwd that is already in curlthreading2. 2012-07-07 14:49:37 +02:00
Lirusaito
6b11776fcf Added in Phoenix's building preferences: removed bloat and waste, made positioning less fragile, repositioned parts more sensibly, and suggested courses of action in comments. 2012-07-06 14:45:39 -04:00
Lirusaito
58ff4a00f1 Some very good points Voodoo had, and some things I noticed and had to correct. 2012-07-06 12:14:55 -04:00
Siana Gearz
30f49526db Stray settings be gone 2012-07-04 10:44:37 +02:00
Lirusaito
b194d9e012 Sync llpaneleditwearable to Shyotl/V2MultiWear version. 2012-07-04 02:02:50 -04: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
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
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
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
221e3908b9 There is no need to use a pure virtual destructor, and doing so crashes libcwd when configured with --enable-alloc. 2012-06-27 04:27:09 +02:00
Aleric Inglewood
782091ff02 Print useful error when dlopen() return NULL on linux standalone. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
c02834b7e3 Use AIThreadSafeDC and _wat convention to simplify AIEvent. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
15fb0ac3aa Allow AIStateMachine::cont() to be called from another thread for an idle statemachine. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
0bee4a922f Make sure that sRunning <= number of threads with status RUNNING. 2012-06-27 04:27:08 +02:00