Commit Graph

184 Commits

Author SHA1 Message Date
Aleric Inglewood
41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
2011-05-14 01:06:19 +02:00
Shyotl
8ac9da7bc8 Disabling buggy old occlusion tweak. Unstable on nVidia. 2011-05-12 19:03:59 -05:00
TighMacFanatic
f83c10208e Spam settings UI page 2011-05-12 00:39:06 -04:00
Aleric Inglewood
133391be90 Merge branch 'master' of https://github.com/siana/SingularityViewer
Resolved Conflicts:
	indra/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
2011-05-10 04:46:58 +02:00
TighMacFanatic
107c3cb70a Merge https://github.com/TighMacFanatic/SingularityViewer
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
2011-05-09 22:06:00 -04:00
Aleric Inglewood
75ff0fc04d Add more support for debugging plugins.
Added support for plugin debug messages and better error reporting
when something goes wrong during start up of SLPlugin.

Also added more debug output regarding general plugin messages
as well as debug output related to AIFilePicker.
2011-05-08 17:49:06 +02:00
Aleric Inglewood
f6b57d956d Added base class AIStateMachine.
This is the skeleton needed to implement classes that can be reused and
work together, which can perform asynchronous tasks (read: need to wait
for certain events before they can continue).

An example would be the task of waiting for a given inventory folder to
be read. This could then be used to improve the builtin AO
(automatically reading that folder when a notecard is dropped, and
continuing when the whole folder is read).

It's first use will be communication with a filepicker that runs
in a plugin.
2011-05-08 17:08:48 +02:00
Aleric Inglewood
3a1d753344 Use LL_DEBUG_TERMINAL_COMMAND and LL_DEBUG_GDB_PATH
Upgraded the code that attaches gdb to a plugin for linux
to the code that I wrote for viewer 2.
2011-05-08 17:08:47 +02:00
Siana Gearz
205a11d44b Merge git://github.com/Shyotl/SingularityViewer 2011-05-08 14:46:28 +02:00
Siana Gearz
82478d4ef2 Apparently some of those is needed on Windows, and it was shoddy 2011-05-08 00:51:00 +02:00
Shyotl
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -05:00
TighMacFanatic
fbb1425ef5 Merge branch 'keyword' 2011-05-04 18:06:02 -04:00
Shyotl
03c98452be Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-03 18:25:31 -05:00
Shyotl
e50aa5ab88 Disabled general spam blocking until exception is added for delayed instant messages. 2011-05-03 18:24:42 -05:00
Siana Gearz
90c22d8edf J2C stream length estimation back to old 2011-05-03 23:53:18 +02:00
TighMacFanatic
1a2663c124 Added setting for storing Avatar Debug Textures floater position. 2011-05-03 01:36:03 -04:00
Siana Gearz
38849c1328 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
2011-05-01 22:55:18 +02:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
TighMacFanatic
56c357911e Chat keyword highlighting 2011-05-01 02:31:05 -04:00
Shyotl
a8f4b3ed4a Merge branch 'master' into V2AvatarPhysics 2011-04-30 22:41:25 -05:00
Siana Gearz
1d90b8624b Updated LSL keywords 2011-04-30 23:28:28 +02:00
Siana Gearz
ee2508274e Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/app_settings/settings.xml
2011-04-30 22:02:02 +02:00
Siana Gearz
4bb68e5a34 Updated root certificates 2011-04-30 22:00:12 +02:00
Shyotl
8b12d794c5 Added physics saved settings.
Emerald physics demoted to legacy. Only enabled on av's that fail to send physics paramaters, or AvatarPhysics is completely disabled.
Params reset when AvatarPhysics is toggled off. (Bugfix for LL's code)
2011-04-28 22:47:48 -05:00
Shyotl
ab35a07f0e Added anti-spam features.
ScriptsCanShowUI:false disables LLMapDestination (from V2)
SH_SpamHandler, derived from Cryogenic's spam blocking:
 If flooded by an object, all objects of same owner get blocked.
 If flooded by an avatar, avatar will be blocked.
 Dialog flood prevention. (Objects only)
 Calling card flood prevention (Avatar only)
 Chat flood prevention. (Avatar and objects)
 IM/Inventory offer flood prevention (Avatar and objects)

See additions to settings_sh.xml for details on new settings pertaining to anti-spam.
2011-04-27 16:39:20 -05:00
Siana Gearz
51133c3894 Dict unbotch 2011-04-27 00:32:12 +02:00
tmac@latestevidence.com
8cf8814f8b Spell check fix 2011-04-26 17:25:57 -04:00
Siana Gearz
04b3dee767 Merge remote-tracking branch 'shyotl/V2TextureSystem' 2011-04-26 00:28:58 +02:00
Siana Gearz
b6c0436c1b Merge branch 'master' of github.com:siana/SingularityViewer 2011-04-26 00:23:01 +02:00
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
Shyotl
f7a5394904 Super-sampling only to be done when taking a snapshot to disk in high-res mode. Clamping to 3x.
Removed 'SHHighResSnapshotForceTile' setting, as tiling is now the only way snapshots can be done.
2011-04-23 17:51:29 -05:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Shyotl
41f42fc741 Nuking some glsl warnings, and fixing relwithdebug compile(and prolly gcc too) 2011-04-23 03:02:56 -05:00
Siana Gearz
955ca21298 OpenSim compatible prim backup 2011-04-19 01:33:09 +02:00
Siana Gearz
ab8656d5d8 Version 1.5.6(1) 2011-04-09 22:57:39 +02:00
Siana Gearz
fd8866c411 Sione's Media Filter 2011-04-08 19:53:41 +02:00
Siana Gearz
0d3c91269b Various fixes, mostly through Henri 2011-04-08 17:51:45 +02:00
Siana Gearz
ba9bd7d41e meta7 LightShare 2011-03-26 16:47:16 +01:00
siana
67915fe8c8 That's why tags wouldn't show initially 2011-03-21 03:43:47 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
Siana Gearz
919d321d4a MultiAttach only on SL 2011-03-16 13:44:12 +01:00
Shyotl
1c33889762 Merge branch 'master' into V2Renderer 2011-03-15 03:15:56 -05:00
Shyotl
ef90cc74e4 Whoops. Reverting some stuff I was toying around with. 2011-03-10 23:13:00 -06:00
Shyotl
1b039a1be6 Deferred has sky and water textures now. Underwater is still borked.
Deferred fastalpha behaves a bit better.
Pulled over patch for https://jira.secondlife.com/browse/STORM-336 and https://jira.secondlife.com/browse/STORM-1011 from linden repo
Sky rendered using new LL method. Assuming this fixes issues on AMD cards(works on cat 11.2)
Added a few things missed related to spatial-parition updating.
Added 'SkipReflectOcclusionUpdates' setting that prevents occlusion updates for reflection pass. Less taxing on CPU.
2011-03-10 23:06:46 -06:00
Shyotl
60f3104eb6 V2 walk/run animations 2011-03-10 23:06:18 -06:00
Siana Gearz
3ce40cf763 Static VFS from V2 - incl new walks! 2011-03-11 00:20:18 +01:00
Siana Gearz
cbda1843a7 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2011-03-09 19:27:51 +01:00
Shyotl
7047283cda V2 walk/run animations 2011-03-08 23:25:32 -06:00
Siana Gearz
dcb2e43329 Release 1.5.5 2011-03-05 16:04:52 +01:00
Siana Gearz
6c94ab3f82 HORRIBLE SianaRenderOmitBlankVBO facepalm 2011-03-03 04:43:49 +01:00