Commit Graph

996 Commits

Author SHA1 Message Date
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
Aleric Inglewood
b82c94383b Make V2Renderer branch compile. 2011-05-24 18:56:53 +02:00
Aleric Inglewood
d27abe5ed8 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-05-24 18:10:21 +02: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
Aleric Inglewood
8ee4ed96b7 Merge branch 'master' of https://github.com/siana/SingularityViewer
Resolved Conflicts:
	indra/llcommon/aithreadsafe.h

Manually added patch had trailing space more.
2011-05-22 22:42:24 +02:00
Aleric Inglewood
820337f75b Merge remote-tracking branch 'shyotl/AlericMaster' 2011-05-22 22:38:46 +02:00
Aleric Inglewood
13560e292e Added AIFetchInventoryFolder and more.
Added a new statemachine AIFetchInventoryFolder, which can be used
to fetch the contents of a folder by name or UUID.

Also added AIEvent (and one event,
AIEvent::LLInventoryModel_mIsAgentInvUsable_true, which is needed
for AIFetchInventoryFolder).

Fixed LLInventoryModel::sBackgroundFetchActive to correctly reflect
whether or not LLInventoryModel::backgroundFetch is added to
gIdleCallbacks.

Avoid duplicated entries in sFetchQueue.

Reset sFullFetchStarted in LLInventoryModel::stopBackgroundFetch to
allow for a renewed full fetch when some single-folder fetch stops it.

Added AIStateMachine::mQueued to make calling 'cont()' more robust:
calling cont() / idle() / cont() on a row would otherwise add a
statemachine twice to the active list, which would cause a crash
when it's killed.
2011-05-22 22:01:11 +02:00
Shyotl
21498e0486 Cloud rendertype toggling should now actually... toggle. 2011-05-22 00:12:25 -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
0785d392e3 Crashfix for LL's recent changes to flexi updating. May revert entire changeset if more oddities are found. 2011-05-21 00:14:46 -05:00
Shyotl
127dd659fa Updated graphical options panel to work with new setting configuration. 2011-05-21 00:13:38 -05:00
Shyotl
285c19090e Slightly smarter flexi update handling, plus extra nullchecks. 2011-05-20 16:07:47 -05:00
Shyotl
9a29428b39 Replaced obsolete priority spatial queue lock with new group-specific variants 2011-05-20 15:51:45 -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
dff4e97c80 Merge branch 'master' into V2Renderer 2011-05-20 12:38:53 -05:00
Shyotl
cf6668cb7a Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-20 12:38:36 -05:00
Shyotl
179885d120 basic_plugin_filepicker now dependancy of secondlife-bin. Added missing windows build step required to place copy of filepicker dll in required directory. 2011-05-20 12:33:30 -05:00
Shyotl
6c3cd6d428 Conditionally allocate deferred renderbuffers. 2011-05-20 10:20:11 -05:00
Shyotl
8562fae08b LLPipeline::rebuildGroups() optimized a bit. 2011-05-19 22:38:51 -05:00
Shyotl
cc60a94af6 Workaround for flickering objects in water reflection pass. 2011-05-19 21:24:46 -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
Shyotl
503b99c54e Preference panel was not correctly referring to AcentHideTypingNotification.
Removed dead code regarding HideTypingNotification.
2011-05-18 23:41:42 -05:00
Shyotl
754bb38169 Exposed 'RenderPreferStreamDraw'
Don't enable AA in deferred/ui/etc unless AA is actually enabled via setting
Standard c array instead of silly vector, since the size is knowable at compile.
2011-05-18 21:01:26 -05:00
Shyotl
7ba10207a4 Belly physics shouldn't have been set to female-only. Eups. 2011-05-18 20:19:09 -05:00
Shyotl
147afb922d Disabled FBO toggle in hardware options panel if in deferred mode... because turning fbos off in deferred is... bad. 2011-05-18 20:07:08 -05:00
Shyotl
4663b605ef Added fullbright shiny underwater shader. 2011-05-18 17:00:44 -05:00
Shyotl
a4b7bbd031 More should-be-safe changes. Prep for pipeline work. 2011-05-18 16:04:46 -05:00
Shyotl
0193173e46 Added #version string to many shaders. Added a few to-be-implemented shader files 2011-05-18 14:58:57 -05:00
Shyotl
62e3aa10c1 Reasonably safe changes.
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
2011-05-18 14:35:27 -05:00
Aleric Inglewood
e1fb1fa6b7 API change of AIFilePicker.
Call AIFilePicker::create() instead of new AIFilePicker.
Renamed deleteMe() to kill() and bs_deleted to bs_killed.
Only default to auto destruct when created with create(true),
otherwise kill() has to be called explicitely.
2011-05-18 03:52:15 +02:00
Shyotl
b314172533 Merge branch 'master' into V2Renderer 2011-05-17 16:39:43 -05:00
Aleric Inglewood
4eb87268bd Don't error when fmod isn't installed (same as Darwin does). 2011-05-17 22:52:35 +02:00
Aleric Inglewood
3656939269 Cancel pose stand when quitting.
This fixes the bug that if you Quit while in the Singularity -> Pose
Stand, then you are permanently hovering over the group until you go
into Advanced -> Debug Settings and reset AscentAvatarZModifier.

It also fixes that before, when you changed AscentAvatarZModifier
in Advanced -> Debug Settings then you saw no effect (until the
viewer would sent an AvatarAppearance message.

After this patch, changing any of the AscentAvatar*Modifier settings
has immediate visible effect, and a pose stand (Z-offset) is reset
when quitting.
2011-05-17 02:42:06 +02:00
Aleric Inglewood
10af185abc Add Advanced --> Character --> Meshes and morphs...
Allows to save the .llm of all mesh objects, and
all morphs of each as .obj (Wavefront OBJ File),
for import in, for example, blender.

You can also load .obj files, but of course they
will only affect what you see locally.
2011-05-16 19:03:48 +02:00
Shyotl
1a2d75fbe6 LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from 2011-05-15 22:50:56 -05:00
Shyotl
51338470b5 Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp
LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere)
LLEventTimer now using LLInstanceTracker
Updated LLLiveAppConfig (Though it appears unused, really)
processor.h is obsolete, thus removed. (llprocessor.h replaces it)
2011-05-15 22:40:59 -05:00
Shyotl
37c5016c2f LLAssetType lookup now done through LLDictionary. 2011-05-15 22:17:15 -05:00
Aleric Inglewood
00f8c35614 Some minor additional changes (filepicker) 2011-05-16 01:26:43 +02:00
Aleric Inglewood
1c21b2c18a Merge remote-tracking branch 'shyotl/AlericMaster' 2011-05-15 23:14:03 +02:00
Aleric Inglewood
93fdc2c89e Speed up of LLViewerObjectList::cleanDeadObjects with a factor of 10000.
Also a little review of Dead objects in general.
The old code was calling 'erase' on a large vector, once for
every dead object (which are a lot, especially if you exit or
teleport), causing the whole (large) vector to be copied every
time. The new code only calls erase once per call (about once
a second at most now), erasing 20 to 100 objects at the END
of the vector. This is INCREDIBLY faster.
2011-05-15 23:02:44 +02:00
Siana Gearz
3abc778f2c Empty splash page workaround 2011-05-15 20:19:26 +02:00
Shyotl
461ddb2ca9 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-05-14 22:31:35 -05:00
Shyotl
3926d2d30a Resolved most errors under vc100 compiler 2011-05-14 22:30:30 -05:00
Aleric Inglewood
697f0ad054 Old VWR-14914 spin-off sound beacon patch.
This makes sound beacons green when playing at
full volume, yellow when playing at a lower volume
and red when they are muted (aka, in another parcel
that you can't hear the sounds of).

Originally this was a debug patch as muted sound
sources used to be implemented by setting the volume
to zero, which happens to use like three times more
CPU: so, having a lot of muted sound source caused
the audio thread to never release a mutex anymore
(cause it was never idle anymore), causing the main
loop to hang, waiting on that mutex - dropping the
FPS drastically. Hence it was necessary to see which
sound sources were muted for debugging purposes.
(Since VWR-14914, muted source source are not played
at all anymore, so they do not take extra CPU).

It's still fun to see this extra information though,
now the patch exists anyway.
2011-05-15 02:23:13 +02:00
Shyotl
66c9e3e1b4 Merge branch 'master' into V2Renderer
Conflicts:
	indra/newview/llvoavatar.h
2011-05-14 14:03:25 -05:00
Shyotl
fb14aff1f6 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-05-14 14:01:58 -05:00
Shyotl
4e47446be1 LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas 2011-05-14 12:38:47 -05:00
Aleric Inglewood
1bc876542c Avoid possible crash on opensim.
See http://redmine.kokuaviewer.org/issues/582

This happened only on opensim. The fixed was made
basically by MichelleZ. It doesn't harm anything, so
even though it appears to never happen on Agni
and it is unknown what bug is causing it, it make the
viewer resilient just-in-case...
2011-05-14 19:38:03 +02:00
Aleric Inglewood
dc9465a521 Old work around for a bug we never found... 2011-05-14 02:45:04 +02:00