025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07: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
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
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
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
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
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
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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
033c45f990
EXP-142 FIXED Disable mouselook in Skylight
2010-10-04 11:21:15 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
9989c304c9
trivial comment changes while I was in this code.
2010-08-13 12:25:59 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
f7ff9c2aa4
trivial comment changes while I was in this code.
2010-08-13 12:25:59 +01:00
75cfa9a0c3
EXT-8051 FIXED Change cameraCustomizeAvatar calls to use gAvatarp->isUsingBakedTextures
...
Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22 15:06:08 -04:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
07406b8397
EXT-8208 FIXED Hide pop-ups on entering mouse-look mode.
...
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/706/
--HG--
branch : product-engine
2010-07-07 21:18:32 +03:00
fcfaa69821
EXT-8020 FIX outfit textures are blurry on opening outfit editor
...
We believe this fix should help with the blurry textures - we weren't
updating our local bake of your avatars' appearance. Added a line to trigger
this refresh.
Code reviewed by Seraph
2010-07-06 18:13:46 -04:00
e8a52ebc51
EXT-8148 Camera transitions are occasionally very slow for appearance editing transitions
...
reviewed by Nyx
2010-07-01 10:33:06 -07:00
6dd35018d2
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
...
added some comments and cleaned up code based on review
2010-06-23 18:32:31 -07:00
0aabcc8134
EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
2010-06-23 16:50:06 -07:00
c0129e4b11
DEV-36437 FIXED (VWR-2485) Menu remains after switch to Mouselook
...
Ported from Snowglobe.
2010-06-21 13:35:55 +01:00
206ce0bb2c
fix for broken rear view camera
2010-06-16 09:50:09 -07:00
8b95793c35
EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation so much
...
also, made camera default target and offset live-settable for debugging
reviewed by vir
2010-06-15 13:53:40 -07:00
37a8c12bd3
merge
2010-06-14 23:04:11 -05:00
76cf9e29a7
EXT-7799 My Appearance - Edit outfit positions camera to previous camera coordinates
...
reviewed by richard
2010-06-14 10:53:28 -07:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
56da8017d9
EXT-7210 Baked textures should only be updated when outfit changes are saved or outfit editor is exited.
...
reviewed and contributed to by Nyx
2010-06-08 14:52:22 -07:00
6d840687a5
Fix for the last part of EXT-7366 (Need to change camera view of avatar previews on 'Front view' while editing shapes).
...
Reviewed by Richard.
2010-06-04 11:56:08 -07:00
cd46893057
EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
...
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor
Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up
All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2
(sorry dessie! :) )
2010-05-27 14:40:49 -04:00
b524aacb59
EXT-7213 WIP kill old appearance editor and all traces of code
...
First pass - eliminated all references to gFloaterCustomize except
those that call saveIfDirty. Haven't compiled, haven't reviewed.
Will clean up in further patches and get reviewed before pushing.
2010-05-25 20:17:23 -04:00
Graham Madarasz