3020a19cbd
Some code cleanup and adding of FS code tags
2013-07-08 13:41:13 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
9cc1dfd4e6
MAINT-1303 FIXED Hide menus and buttons after exiting mouselook if 'Hide all controls' is switched on.
2012-10-18 18:58:55 +03:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
77b33d9623
SH-3264 Porting over the XML loading of the avatar structure to llappearance
...
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
837446ac13
More FIRE-8798: Setting should only effect movement related resetView() calls. Also, silence a warning in llappearancemgr.cpp
2013-01-10 20:15:49 -07:00
6561941ab7
Simplify fix for FIRE-8798 by moving the control to llagentcamera. Also, commented out some unused variables.
2013-01-07 20:17:29 -07:00
9d6144f500
Option to disable mouse wheel for camera zooming in/out
2012-12-17 19:08:35 +01:00
cf586a0df8
FIRE-6004: Added notification message to phototools camera floater if camera view can't be restored
2012-11-13 14:57:36 +01:00
64ad1aba30
SH-3258 WIP initial work: refactoring appearance editing mode
...
Added flags for appearance editing status as well as which textures we should be using at a time.
Also refactored so we are not using camera state to track appearance editing mode.
Need to add more handling for which textures we actually use.
2012-07-11 18:30:39 -04:00
31c7e42a66
FIRE-7758: Just store object UUID and only restore view if camera position would still be within draw distance
2012-09-28 17:20:51 +02:00
d9b2e43644
FIRE-7758: Add option to temporary save and restore camera position; button textures by Whirly Fizzle
2012-09-27 22:19:07 +02:00
60ef266568
Added CTRL/SHIFT+Scrollwheel to alter camera focus and offset. ESC resets to default values. Implements FIRE-5537
2012-06-05 20:22:03 +02:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
866eeb7897
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
0d215ba34f
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
...
made mouselook work when hiding ui by unhiding UI first
2011-10-14 13:10:02 -07:00
8e3717e187
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
...
hide toolbars in mouselook
hide top_info_bar when hiding UI
disable mouselook when hiding UI
fixed layout of more button in navigation bar
2011-10-13 20:31:41 -07:00
74aff082df
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-08-06 20:06:42 +02:00
ec6be3fdb9
Fix for sh-1586 & sh-1654 # Alt-zooming camera flipping
2011-06-17 10:47:33 -04:00
6d436f152b
Fix for camera wonkiness (sh-1654 ...)
2011-06-16 15:23:49 -04:00
a713ffa247
Merged with default tip (Revision ddfc2ed6aee1)
...
--HG--
branch : RLVa
2011-05-25 13:37:12 +02:00
4374f53e23
SH-1586 Fix for bad camera behavior introduced by SH-1119
2011-05-18 02:02:52 -05:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
79664c1017
Fix for sh-1119: Alt Zooming on assets that contain a pivot point can at times cause erratic camera movement
2011-03-10 12:09:29 -05:00
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
551bfb88fc
Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate)
2010-12-17 07:29:27 -05:00
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
9498c31d3c
Merged with default tip (Revision aeb7e6c38341)
...
--HG--
branch : RLVa
2010-10-31 23:41:40 +01:00
ea32129f49
STORM-452 FIXED Made protective fix for crash in LLAgentCamera::resetView().
...
I managed to reprodcuce the crash once and couldn't reproduce it any time later, so this fix is made judging from line that I found (viewer was in debug mode when it happened)
in call stack after crash. Added check for gMenuHolder against NULL to prevent further crashing. There is no 100% guarantee that this fixes the crash from ticket, but it won't do any harm either.
2010-10-27 19:23:52 +03:00
65185139cc
First sweep of changes for settings (and a few functions) from Phoenix prefix to FS.
2011-10-10 06:10:45 +02:00
cc3564a716
FIRE-1452, options for hiding local lookat effects
2011-09-03 12:58:25 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
7a053e8abf
Re-enabled "/" keystroke for starting gestures in nearby chatbar incl. properly working Shared Media prims. Fixes FIRE-1990
2011-07-08 20:19:40 +02:00
22940da985
Backed out changeset 0149d1597782
2011-06-24 23:19:20 -04:00
a16c902d5f
FIRE-1482: Fixed head/eye movement still moving viewerside while Hide Lookat Beacons is on (Patch from Ansariel Hiller)
2011-06-23 21:02:55 -07:00
145b659f13
merging Zi's AO work
2011-04-27 17:53:39 -04:00
bd2eaeb7f9
Use correct debug setting for private point at. From Ansariel Hiller, fixes FIRE-949.
2011-04-24 12:59:42 -05:00
Ansariel