Commit Graph

340 Commits

Author SHA1 Message Date
Siana Gearz
839418991e Version 1.5.9(1) 2011-06-19 00:41:56 +02:00
Siana Gearz
79ed0bcff0 Merge git://github.com/Shyotl/SingularityViewer 2011-06-18 22:44:31 +02:00
Shyotl
7ba9e0baca Added llGetEnv and llRegionSayTo to function dictionary. Fixed llGetLinkPrimitiveParams not having a return type in function dictionary. 2011-06-16 22:41:47 -05:00
Siana Gearz
d1cb6d3335 Silly old merge unbotch 2011-06-17 01:03:27 +02:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Siana Gearz
2bde195c77 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/cmake/Boost.cmake
2011-06-09 15:30:19 +02:00
Shyotl
b691e2b286 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-06-08 14:19:43 -05:00
Aleric Inglewood
5d87098bd0 Port Viewer 2 indra/llvfs
This introduces some API changes, like the new LLDirIterator,
that causes changes elsewhere.

It also include Log Linden's cache changes that aren't in
viewer-development yet that increase the maximum cache size
to ~10 GB.
2011-06-06 21:38:58 +02:00
Siana Gearz
630059a74f Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2011-06-05 19:56:46 +02:00
Siana Gearz
1473486f23 Apply hollow size patch by Zauber Paracelsus 2011-06-05 19:09:43 +02:00
Shyotl
278cfbdb67 Exposed light projection textures in object edit panel. 2011-06-04 15:09:37 -05:00
Aleric Inglewood
fed8951e00 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-06-03 22:48:23 +02:00
TighMacFanatic
da23cd1f42 More updates to preferences UI and bug fixes. 2011-05-28 21:31:35 -04:00
Shyotl
71eec1caed Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred. 2011-05-28 01:46:11 -05:00
TighMacFanatic
139a3d35bb Further updates to preferences for bug fixes and user friendliness. 2011-05-26 00:20:45 -04: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
7a907c4448 RenderLightingDetail renamed to RenderLocalLights. Toggling light level should work now. RenderDeferredFullscreenLights removed. 2011-05-22 00:11:12 -05:00
Shyotl
127dd659fa Updated graphical options panel to work with new setting configuration. 2011-05-21 00:13:38 -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
503b99c54e Preference panel was not correctly referring to AcentHideTypingNotification.
Removed dead code regarding HideTypingNotification.
2011-05-18 23:41:42 -05: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
TighMacFanatic
990fe86438 Merge branch 'FloaterPositions' 2011-05-15 20:13:26 -04:00
TighMacFanatic
9706141b8f Tweaked Pay floater to not have overlapping elements. 2011-05-15 20:12:43 -04:00
TighMacFanatic
9f3c4c1021 Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-05-14 14:21:17 -04:00
Aleric Inglewood
4c9d9d44a4 Add 'Save As...' back to snapshot floater. 2011-05-14 01:34:27 +02: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
Siana Gearz
4d9e7fa8c1 Deferred settings 2011-05-12 22:10:10 +02:00
TighMacFanatic
3a60326ad5 Merge branch 'spamui' 2011-05-12 14:10:00 -04:00
TighMacFanatic
e098ec7d46 Merge branch 'FloaterPositions' 2011-05-12 14:09:53 -04:00
TighMacFanatic
e2a220ac3c Tweaks to UI sizes so they fit better 2011-05-12 14:08:57 -04:00
TighMacFanatic
3f426fcb67 Added Open History button to local chat 2011-05-12 13:35:31 -04:00
Siana Gearz
6d5d90bd92 Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer 2011-05-12 15:16:17 +02:00
TighMacFanatic
f83c10208e Spam settings UI page 2011-05-12 00:39:06 -04: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
Siana Gearz
e2e576e550 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Siana Gearz
7e75a897ca Release 1.5.7 2011-05-08 16:46:12 +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
2a9e7ec5f7 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-07 17:24:36 -05:00
Shyotl
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -05:00
Siana Gearz
f052915f54 Fix name in grant/ungrant edit right. Issue 33 2011-05-06 04:34:32 +02:00
Aleric Inglewood
f2199a504b More various small, old patches.
Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
2011-05-04 19:48:16 +02:00
Aleric Inglewood
1b4ae2e3b5 Removed generated file mime_types.xml, and fixed indentation in the source files.
indra/newview/skins/default/xui/en-us/mime_types.xml should be generated
from mime_types_linux.xml, mime_types_mac.xml or mime_types_windows.xml
by copying it when packaging. Hence, it should never be used.

Note, this is an exact sync with imprudence.
2011-05-02 15:26:49 +02:00
Siana Gearz
5fd1312ae0 Restoring grid nickname in manager 2011-05-02 02:21:26 +02: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