Commit Graph

148 Commits

Author SHA1 Message Date
Aleric Inglewood
fed8951e00 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-06-03 22:48:23 +02:00
Aleric Inglewood
f8c3617540 Merge branch 'master' into V2Renderer 2011-05-25 20:12:30 +02:00
Aleric Inglewood
e3742734f0 Beacons (floater) fixup
After a user spend three days trying to find out why certain
textures looked red (as if they had alpha and you pressed
control-alt-T, but not all of them were like that); and nothing
helped, not relogging, not clearing cache, not even reinstalling
the viewer... I decided to take this bug serious. Note that,
according to Shyotl, there have been more users every now and
then that reported this problem.

The problem (after doing a research for 1 hour) turned out
to be that she had beacons on, highlighting prims with scripts.
The immediate bug is, of course, that this was persistent over
a relog. Upon further investigation, this bug exists because
a Debug Setting had a double meaning: it meant both "beacon
floater is visible", which you want to be persistent, and it
was later renamed and given the meaning "Keep beacons when
closing the floater". Digging deeper it turned out that there
was a REAL mess with regard to the beacons: A non-finished
floater with immature comments (called "dingdong floater") was
half-created and replaced the original floater which, according
to the comment was "so fucked over and over" (== commented out
in several places), but then everything was commented out and
replaced with a menu (because they couldn't get it to work?).
The floater simply didn't exist anymore! That reduced the
meaning of the Debug Setting to "Show beacons", although you
now could only set it in the menu by clicking on "Beacons Always On"
where 'Always' refers to also on when the floater isn't there.

I nuked the immature dingdong code, brought back the original
floater as it was in snowglobe (and still is in Imprudence),
fixed it up a bit with a nicer layout (indentation and spacing)
and disabling (graying out) when needed, and added a new checkbox
that will allow people to still keep/see the beacons after closing
the floater.

In the end this requires THREE Debug Setting variables:
ShowBeaconsFloater : TRUE when the floater is visible, FALSE when not.
                     This is persistent, so the floater is still
		     there if you relog with the floater open.
BeaconsKeepVisible : TRUE when the new checkbox is checked.
		     Also persistent.
BeaconsVisible : TRUE when the beacons are rendered, FALSE otherwise.
		 This is NOT persistent: we don't want unsuspecting
		 users to try and get rid of the weird 'red prims'
		 by relogging and failing at that.
2011-05-25 19:55:42 +02:00
Shyotl
4ee4d52b2f Added bokeh DoF. Fixed some several SSAO and shadow combinations. Fixed GI crash bug. Enabled several fasttimers. Updated shaders. 2011-05-24 20:31:17 -05:00
Shyotl
34f252f52e Updated featuretables. Ultra now enables deferred except without shadows. Also cleaned up to work with renamed/removed settings. 2011-05-22 22:27:27 -05:00
Shyotl
7a907c4448 RenderLightingDetail renamed to RenderLocalLights. Toggling light level should work now. RenderDeferredFullscreenLights removed. 2011-05-22 00:11:12 -05:00
Shyotl
77f09744ab Merge branch 'AlericMaster' into V2Renderer
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
Shyotl
1bb009dcf7 Using new LLLightState class instead of direct glLight calls, also other misc cleanup. 2011-05-19 18:56:49 -05:00
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
632a0b3e1f Merge branch 'master' into V2Renderer 2011-05-12 19:29:20 -05:00
Shyotl
8ac9da7bc8 Disabling buggy old occlusion tweak. Unstable on nVidia. 2011-05-12 19:03:59 -05:00
Shyotl
d1d6994419 Full v2.6 renderer. 2011-05-12 00:13:38 -05: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
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
Shyotl
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -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
Shyotl
a8f4b3ed4a Merge branch 'master' into V2AvatarPhysics 2011-04-30 22:41:25 -05: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
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
Siana Gearz
b6c0436c1b Merge branch 'master' of github.com:siana/SingularityViewer 2011-04-26 00:23:01 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04: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
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
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
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
Siana Gearz
633b6d22f2 Emerald Local Assets 2011-03-03 03:30:58 +01:00
Siana Gearz
6cfda5e661 Ubuntu typeface for UI 2011-03-02 02:41:54 +01:00
Siana Gearz
73becacbf5 font grrrrgrghgh 2011-03-01 06:23:23 +01:00
Siana Gearz
8d85f67757 Imprudence AO 2011-03-01 04:16:54 +01:00
Siana Gearz
c8602110e4 Client list debugsetting 2011-02-27 15:42:19 +01:00
Siana Gearz
c1eaba08f4 Minimap cleanup 2011-02-26 00:13:59 +01:00
Siana Gearz
d2896a0947 OpenSim compatible world map. YUCK!!! 2011-02-24 11:31:39 +01:00
Siana Gearz
dcab2ae3a5 Better Minimap, from Henri 2011-02-24 02:56:43 +01:00