Don Kjer
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
Vadim ProductEngine
31c1cff64f
STORM-1262 FIXED Removed the original Windlight Region Settings implementation.
2011-07-06 00:42:28 +03:00
Paul ProductEngine
9afc77ba0a
SH-1719 FIXED Viewer side cleanup of presentation of accounting data in build tools
...
- Moved grid mode combo box to the grid options floater
- Updated UI of the build floater according to the spec
- Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
2011-06-21 21:00:06 +03:00
Oz Linden
8bfd3201de
merge changes for latest viewer-development
2011-06-01 22:07:12 -04:00
Oz Linden
a99941a7fd
merge changes for latest windlight integration project repo
2011-05-26 20:26:36 -04:00
Vadim ProductEngine
bbde07245b
STORM-1285 WIP Connected "Create/Edit Water / Sky / Day Cycle" floaters (not functional) to the main menu.
2011-05-26 23:09:30 +03:00
Vadim ProductEngine
ebfbf2a561
STORM-1285 WIP Connected "Delete Water / Sky / Day Cycle" floaters (not functional) to the main menu.
2011-05-26 23:06:41 +03:00
Dave SIMmONs
d6f7526abf
Merge
2011-05-24 14:28:25 -07:00
Oz Linden
551d17f819
merge latest changes (post-2.7.0) from viewer-development
2011-05-23 11:38:33 -04:00
Oz Linden
2de13f8070
merge changes for storm-1259
2011-05-18 09:46:28 -04:00
Don Kjer
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
Don Kjer
ae8ed3fc2d
Merge with viewer-development
2011-05-17 19:21:55 +00:00
Vadim ProductEngine
001b9e5ae3
Merge from viewer-development.
2011-05-17 21:53:10 +03:00
Seth ProductEngine
ec749bb1c1
STORM-1244 FIXED Environment Settings floater implementation.
2011-05-17 17:09:15 +03:00
Jonathan Yap
4d2a64c4a4
STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to see in 1.23
2011-05-16 16:34:26 -04:00
Dave Parks
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
Vadim ProductEngine
912f021bb1
STORM-1245 WIP Implement loading and applying region environment settings.
2011-05-16 17:17:22 +03:00
Vadim ProductEngine
cccca566bd
STORM-1245 WIP Reimplementing management of local presets according to the new spec.
...
User environment preferences are now persistent.
TODO: Implement applying region env. settings.
2011-05-16 17:17:01 +03:00
Dave Parks
93696ac019
merge
2011-05-12 17:39:08 -05:00
Oz Linden
353d2059fc
merge up to latest viewer-development
2011-05-11 13:47:12 -04:00
brad kittenbrink
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
brad kittenbrink
dbc92691a6
Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies.
2011-05-05 17:13:52 -07:00
Richard Linden
78d76eb4b0
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
2011-05-02 17:29:56 -07:00
Leyla Farazha
37ef2c4f0f
EXP-670 Voice for basic mode
...
reviewed by Merov
http://codereview.lindenlab.com/6231263/
2011-04-27 16:45:33 -07:00
Dave Parks
764412f9b5
merge
2011-04-22 11:50:19 -05:00
Vadim ProductEngine
db6862e15b
STORM-1174 FIX Moved "Use Region Environment Settings" to the "World -> Edit My Environment" menu.
...
It has been a checkbox in the environment editor.
2011-04-19 23:24:28 +03:00
Don Kjer
01f4570c79
Merge with viewer-development
2011-04-14 18:27:31 +00:00
Oz Linden
6bdfc3d048
merge out changes up to but not including the STORM-610 change
2011-04-13 12:03:53 -04:00
Oz Linden
5dea0bb37c
merge changes for viewer-social-2
2011-04-08 17:36:13 -04:00
Oz Linden
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
Vadim ProductEngine
a2c4bb8049
STORM-1126 merge 2
2011-04-05 20:47:39 +03:00
Richard Linden
80efbeead1
merge
2011-04-01 18:23:13 -07:00
Don Kjer
d292053c04
Merge with viewer-development
2011-04-01 23:37:30 +00:00
Richard Linden
878b0e2da1
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
2011-04-01 14:13:05 -07:00
Oz Linden
4047349ade
merge out latest viewer-autobuild2010 changes
2011-03-31 16:47:35 -04:00
Vadim ProductEngine
5a0547cdc3
STORM-1126 merge
2011-03-31 18:46:56 +03:00
Vadim ProductEngine
79fb8e2ec2
STORM-1126 WIP Windlight Estate Settings integration: pass 4
...
Changes:
* Fixed incorrect way to pass parameters to notifications.
* Fixed crashes in the Advanced Sky floater and the Region Terrain panel.
* Fixed initialization and multiple instantiation of the Day Cycle floater
(that might lead to incorrect behavior).
* Fixed and re-enabled committing env. settings changes to region.
* Fixed day cycle and sky settings being sent as empty arrays and therefore not passing validation on server.
It is now possible to change region environment settings.
* Added debug messages.
2011-03-31 18:24:01 +03:00
Oz Linden
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
Richard Linden
a2e3a00270
SOCIAL-714 FIX [PUBLIC] Basic mode to launch with Destinations panel open by default
...
fixed not being able to toggle off avatar/destination guide by clicking button again
2011-03-24 15:48:44 -07:00
Richard Linden
d9849178d8
minor whitespace change
2011-03-24 11:22:20 -07:00
Dave SIMmONs
7517f25c43
ER-650: touch events. Added 'requestTouch' API for LLAgent operations via llEventHost. Re-factored some message sending code for grabs. Reviewed by Kelly
2011-03-24 10:39:22 -07:00
Oz Linden
fb1facf13a
syncing up to viewer-development
2011-03-24 13:22:43 -04:00
LanceCorrimal
64e8bd3a99
Fixed VWR-25269
2011-03-24 10:20:35 +01:00
Richard Linden
fdf63ba075
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
2011-03-23 19:34:15 -07:00
Richard Linden
9c82ea334a
SOCIAL-714 FIX [PUBLIC] Basic mode to launch with Destinations panel open by default
2011-03-23 17:02:23 -07:00
Jonathan Yap
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
Richard Linden
35c39d92e7
SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml file) is in Advanced mode
2011-03-19 00:57:10 -07:00
Richard Linden
097e076a72
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
2011-03-18 11:42:39 -07:00
Richard Linden
5f05157fb7
SOCIAL-749 FIX Clicking on world to dismiss context menus causes your avatar to walk to click
2011-03-17 15:50:51 -07:00
Richard Linden
a024493c04
eol fixes
2011-03-15 13:36:23 -07:00