Commit Graph

1175 Commits

Author SHA1 Message Date
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
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
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
Shyotl
ccce2a0641 Combox for reflection detail was not initializing to correct selection. 2011-05-13 02:20:50 -05:00
Shyotl
8ac9da7bc8 Disabling buggy old occlusion tweak. Unstable on nVidia. 2011-05-12 19:03:59 -05:00
Shyotl
9cac5233af Setting the correct variable on Physics LOD setting change sounds like a good idea. 2011-05-13 01:16:20 +02:00
Siana Gearz
0b25aa8ed5 Updated libpng (windows) and ogg/vorbis (all) 2011-05-13 01:01:59 +02:00
Aleric Inglewood
3774547367 Redo the copyconstructor hack for AI*Access objects.
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.

The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-13 00:37:47 +02:00
Shyotl
2c1a46c70d A stability and leak fix regarding editing physics wearables. Thanks Henri! 2011-05-13 00:36:04 +02:00
Siana Gearz
4d9e7fa8c1 Deferred settings 2011-05-12 22:10:10 +02:00
Aleric Inglewood
5f72cbb103 Add support for flushing messages from plugin to viewer.
Actually flush messages before terminating a plugin (upon
the shutdown message) and flush messages in the file- and
dirpicker before opening the blocking dialog. Flush debug
messages too (deeper into the code, just prior to the actual
blocking call).

Also, fix the context folder map to be a thread-safe
singleton and *attempt* to add support for default folders
to windows and Mac. The latter might even not compile yet
and definitely have to be tested (and fixed):
Opening a DirPicker in preferences --> Network and Set
the directory location of the cache. It should open a
Dialog window where you are already in the folder that
is the current cache directory setting (you can click
Cancel after verifying that this worked).
And, start to upload an image, select a file is some
directory (other than what it starts in). You can omit
the actual upload by clicking cancel in the preview.
Then upload again and now it should start in the same
folder as that you were just in. Possibly you need to
first open a file picker elsewhere with a different context
though, or windows might choose to open in the last
folder anyway while the code doesn't really work. Uploading
a sound before the second texture upload should do the
trick.
2011-05-12 18:22:51 +02:00
narv
ebe7053526 Version 1.5.7(2) 2011-05-12 07:50:34 -07:00
narv
981e4f39b2 Revert to build llcommon on Darwin 2011-05-12 07:41:49 -07:00
Siana Gearz
6d5d90bd92 Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer 2011-05-12 15:16:17 +02:00
narv
636ef25eef Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-05-12 01:24:54 -07:00
TighMacFanatic
f83c10208e Spam settings UI page 2011-05-12 00:39:06 -04:00
Siana Gearz
50310ba263 Merge git://github.com/Shyotl/SingularityViewer 2011-05-12 00:57:03 +02:00
Siana Gearz
b3847fdeed Build fixes 2011-05-11 23:06:49 +02:00
Siana Gearz
29feeccf0d Minimap fluke fix, thx Aleric 2011-05-11 23:06:19 +02:00
Siana Gearz
6b61e2dd2a Fix linkage in debug build on Windows 2011-05-11 12:47:24 +02:00
Aleric Inglewood
38b33328e6 Redo the copyconstructor hack for AI*Access objects.
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.

The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-11 03:47:42 +02:00
Aleric Inglewood
a6cb676d4a Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.
Also removed some code from the Mac/windows code in
indra/plugins/filepicker/llfilepicker.cpp that shouldn't
be in there anymore (send_agent_pause/resume and updating
the LLFrameTimer stuff).
2011-05-11 03:01:34 +02:00
Shyotl
b61b0ca932 ShowLookAt now depth-tested 2011-05-10 13:52:59 -05:00
Siana Gearz
b81cfb2c4f Version 1.5.7(1) 2011-05-10 14:51:27 +02:00
Siana Gearz
eeeb44755a Make minimap not die on dead objects 2011-05-10 13:50:44 +02:00
Aleric Inglewood
fa51d52578 Workaround for gcc 4.2.x.
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.

g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 13:47:17 +02: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
Aleric Inglewood
e0b0fa4f58 Use AIFilePicker everywhere.
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.

Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
2011-05-10 04:27:57 +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
81550aa6de Workaround for gcc 4.2.x.
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.

g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 03:11:48 +02:00
Siana Gearz
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +02:00
Shyotl
005507c891 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-09 00:15:20 -05:00