livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,765 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

115 Commits (e75a7983cc4e2e71e78798f6b690282dd4c656d2)

Author SHA1 Message Date
Tank_Master e41ca4b4b8 merge RLVa update 2013-11-11 00:40:45 -08:00
Kitty Barnett da78d3f231 - added : @tprequest=n|y and @accepttprequest[:<uuid>]=n|y 
-> small expansion of RlvActions to handle teleport offer/request checks

--HG--
branch : RLVa
 2013-11-09 01:20:15 +00:00
Ansariel 3073c750ae Some more caching of frequently called gSavedSettings 2013-09-06 20:31:24 +02:00
Kitty Barnett 10a289598b Merged with default tip (Revision 74cc289067c8) 
--HG--
branch : RLVa
 2013-07-21 22:33:04 +02:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Kitty Barnett 4101c43f5f Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : RLVa
 2013-02-20 19:25:10 +01:00
Kitty Barnett e1b955226d Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : RLVa
 2013-02-11 23:04:05 +01:00
Nyx Linden 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
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master 8146bbda39 Merge 2013-07-09 16:26:07 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Ansariel 3020a19cbd Some code cleanup and adding of FS code tags 2013-07-08 13:41:13 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
maxim_productengine 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
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Nyx (Neal Orman) 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
Don Kjer 21c364c4d4 Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines 2012-09-03 09:10:24 +00:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Cinders 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
Cinders 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
PanteraPolnocy 9d6144f500 Option to disable mouse wheel for camera zooming in/out 2012-12-17 19:08:35 +01:00
Ansariel 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
Nyx (Neal Orman) 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
Ansariel 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
Ansariel 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
ziree 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
Nicky 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
Nicky 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
Kitty Barnett 866eeb7897 Merged with default tip (Revision 913d90c3225b) 
--HG--
branch : RLVa
 2011-11-04 17:40:17 +01:00
Richard Nelson 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
Richard Linden 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
Kitty Barnett 74aff082df Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-08-06 20:06:42 +02:00
prep linden ec6be3fdb9 Fix for sh-1586 & sh-1654 # Alt-zooming camera flipping 2011-06-17 10:47:33 -04:00
prep linden 6d436f152b Fix for camera wonkiness (sh-1654 ...) 2011-06-16 15:23:49 -04:00
Kitty Barnett a713ffa247 Merged with default tip (Revision ddfc2ed6aee1) 
--HG--
branch : RLVa
 2011-05-25 13:37:12 +02:00
Dave Parks 4374f53e23 SH-1586 Fix for bad camera behavior introduced by SH-1119 2011-05-18 02:02:52 -05:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
prep 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
Kitty Barnett 604345b918 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-02-19 01:12:23 +01:00
Don Kjer 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
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Jonathan Yap 551bfb88fc Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate) 2010-12-17 07:29:27 -05:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Loren Shih a5e63b1dc0 Merge 2010-11-08 12:57:26 -05:00