Commit Graph

1416 Commits

Author SHA1 Message Date
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
Siana Gearz
1327c80dd7 Don't assume we have perftools 2011-05-18 15:41:14 +02: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
TighMacFanatic
3dff6922c2 Added missing settings*.xml files to CMakeLists.txt. 2011-05-17 13:07:32 -04:00
TighMacFanatic
c3a38c1704 Settings names unbotch. 2011-05-17 12:58:05 -04:00
TighMacFanatic
2b412bffec Updated preferences system for bug fixes and user friendliness. 2011-05-17 12:54:30 -04: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
addb7a559e Generalize how -fPIC is added, even in cwdebug.
Although the file is empty when not compiling with CWDEBUG,
windows doesn't like the -fPIC there.
2011-05-16 23:49:03 +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
TighMacFanatic
14dd55a035 Bug fix on Avatar Cloth setting not working properly. 2011-05-16 00:26:31 -04: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
fe372028dc Shuffled LL_COMMON_API around in spots to match v2
Added llformat_to_utf8
Added LLProcessLauncher::getExecutable()
LLStringTableEntry() ctor and dtor definitions moved from .h to .cpp
(should be safe)
2011-05-15 22:47:23 -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
e3435d7ef9 Slight llcharacter updates from v2 (should be safe) 2011-05-15 22:22:22 -05:00
Shyotl
37c5016c2f LLAssetType lookup now done through LLDictionary. 2011-05-15 22:17:15 -05:00
TighMacFanatic
990fe86438 Merge branch 'FloaterPositions' 2011-05-15 20:13:26 -04:00
Siana Gearz
742ecf395f One last GCC 4.6 stopgap 2011-05-16 02:12:46 +02:00
TighMacFanatic
9706141b8f Tweaked Pay floater to not have overlapping elements. 2011-05-15 20:12:43 -04:00
Siana Gearz
adeba18356 GCC 4.6 fixes 2011-05-16 01:37:00 +02: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
Siana Gearz
bd153fc68f Public Thread Safety notice:
<add a cheesy cooment here>
2011-05-15 14:24:15 +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
4e68f5878a Add missing AIReadAccessConst initialization of mIsCopyConstructed 2011-05-15 05:03:34 +02: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
Aleric Inglewood
2d648c1da0 Workaround for windows compiler bug.
Visual C++ compiler doesn't like to take a pointer to a variable
in the argument list of that variable when it is being declared.
2011-05-14 23:43:19 +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
TighMacFanatic
9f3c4c1021 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-05-14 14:21:17 -04: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
Siana Gearz
32594cd651 Version 1.5.8(1) 2011-05-14 03:27:08 +02:00
Aleric Inglewood
dc9465a521 Old work around for a bug we never found... 2011-05-14 02:45:04 +02:00
Aleric Inglewood
74b58b7b3c Stop the viewer from crashing when someone puts a callingcard in a notecard.
This crashed me (on imprudence) because someone gave me a notecard
with a calling card in it.
2011-05-14 02:33:11 +02:00
Aleric Inglewood
675ef17d92 Bug fix: don't loop endlessly when getParentFloater returns it's argument.
It has happened to me that this hung the viewer. The cause is that
when you call parent->getParentFloater(child), then getParentFloater
which starts like this:

LLFloater*   LLFloaterView::getParentFloater(LLView* viewp)
{
    LLView* parentp = viewp->getParent();

starts with parentp == this. And the following logic causes
it to return 'viewp'!

I'm pretty sure that getParentFloater's whole design is wrong,
but I don't see another way to avoid this problem then with
this hack, except by making changes that do a lot more and
are a risk with regard breaking code elsewhere.
2011-05-14 02:22:37 +02:00
Aleric Inglewood
4c9d9d44a4 Add 'Save As...' back to snapshot floater. 2011-05-14 01:34:27 +02: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
Siana Gearz
8df737b488 Not pretty, but i damn know this escaper works 2011-05-14 00:38:43 +02:00
Aleric Inglewood
ea2cc3e0de Make FilePicker context sensitive default paths persistent over logins.
Also, make newview/statemachine a separate project.
2011-05-13 23:50:56 +02:00
Siana Gearz
ea31271ac1 Version 1.5.8 2011-05-13 20:27:34 +02:00
Siana Gearz
72a502eee4 Make radar readable 2011-05-13 15:13:07 +02:00
Siana Gearz
5aa145cc02 Merge git://github.com/narv/SingularityViewer 2011-05-13 13:26:33 +02:00
Siana Gearz
def7d1052c Merge git://github.com/Shyotl/SingularityViewer 2011-05-13 13:21:11 +02:00
Shyotl
a3ac5a43b3 Changed how the enabled state for the deferred checkbox is handled in the graphics floater
It now is disabled if:
-Lacking hardware support for FBOs
-RenderDeferred not permitted in gpu feature table
-RenderAvatarVP not permitted in gpu feature table
-VertexShaderEnable is enabled and permitted in gpu feature table
-WindLightUseAtmosShaders is enabled and permitted in gpu feature table

Enabling deferred now requires WindLightUseAtmosShaders to be on beforehand, instead of blindly enabling it.
2011-05-13 02:26:14 -05:00
Shyotl
40d813699b Added Framebuffer Object checkbox to 'Hardware Options' floater. 2011-05-13 02:21:43 -05:00