Commit Graph

380 Commits (a2d8f0cb3308fed1cb2c8d5fa8fb74ec4cefa45b)

Author SHA1 Message Date
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Oz Linden c857064af2 merge changes for storm-1101 2011-04-12 20:35:33 -04:00
Richard Linden 1d34e7b90b Automated merge with http://hg.secondlife.com/viewer-development 2011-04-06 15:20:51 -07:00
Oz Linden b5c834c6fd merge changes for STORM-1051 2011-04-05 07:23:43 -04:00
callum b286a9091b SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
Jonathan Yap 67561663da STORM-1101 Using the -login parameter makes some keys and right click menus not work 2011-03-23 14:55:28 -04:00
Richard Linden 784c2079e9 SOCIAL-714 FIX Basic mode to launch with Destinations panel open by default 2011-03-17 15:57:57 -07:00
callum ca6ca87934 Merge with tip of viewer development 2011-03-14 17:35:30 -07:00
Dave Parks 5cf5e4bb88 merge 2011-04-19 16:35:37 -05:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Loren Shih be553242ef Automated merge up from viewer-development into mesh-development 2011-03-21 10:38:39 -04:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Loren Shih 13705596af Automated merge up from viewer-development into mesh-development 2011-03-14 12:03:14 -04:00
Richard Linden c2bde809e5 SOCIAL-575 FIX Side panel displayed in Minimal skin on first launch 2011-02-25 11:09:11 -08:00
Jonathan Yap ce975c7572 STORM-1020 Use tabs instead of spaces in fix. 2011-02-23 18:58:28 -05:00
Jonathan Yap 5b90db03d7 STORM-1020 It is sometimes necessary to press ALT+CTRL+D twice to get the Debug menu on the login screen 2011-02-23 18:51:29 -05:00
Don Kjer 28ef58285e Comment fix from code review with brad 2011-02-23 02:10:54 +00: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
Brad Payne (Vir Linden) 49b8f8af02 SH-915 WIP - LLAgentPilot class cleanup, added interpolation for camera motion 2011-02-10 15:57:08 -05:00
Brad Payne (Vir Linden) 3ae3a4a6cb SH-915 WIP - support pilot.xml with extended camera info 2011-02-09 17:07:13 -05:00
Loren Shih 38f4bad925 Automated merge up from viewer-development 2011-01-21 10:36:29 -05:00
Joshua Bell dee9c80862 merged 2011-01-13 12:16:54 -08:00
Joshua Bell 20b983afe0 VWR-24401 Show TOS and other login dialogs when --login is used 2011-01-13 11:52:58 -08:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Seth ProductEngine 376ee7a3f9 STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
2010-12-30 18:18:33 +02:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Merov Linden f8325ac588 STORM-805 : add some printout to the log so we can trace the answer map-server-url at startup 2010-12-22 22:09:42 -08:00
Merov Linden 36207fcf1a STORM-805 : Fix the map URL 2010-12-20 12:59:17 -08:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Bill Curtis 066d8c39ca Automated merge with file:///Users/Bill/Projects/viewer-release 2010-11-19 14:11:42 -08:00
Bill Curtis cb8b30864f fixed typo 2010-11-19 14:01:30 -08:00
Bill Curtis c5e5af4219 added logging and default value for max-agent-groups 2010-11-18 10:37:45 -08:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Brad Payne (Vir Linden) d9c0e0ba74 SH-275 FIX: non-production grids now default to different source of map tiles 2010-11-12 17:31:27 -05:00
Bill Curtis 31e0c9122e fixing transposed characters 2010-11-09 10:25:11 -08:00
Bill Curtis 3fa059409a changes to read max-agent-groups from login.cgi response 2010-11-08 10:54:58 -08:00
callum 34ca69949f Reworked fix for EXP-167 Add option to quit instead of going back to login screen 2010-10-11 16:36:59 -07:00
callum f65bd3c1f1 Fix for Reopened EXP-167 Add option to quit instead of going back to login screen. 2010-10-08 16:41:33 -07:00
callum dd2eff8da2 EXP-167: Quit On Login Page Activated - viewer code /default setting 2010-10-07 12:08:03 -07:00
Roxie Linden 8766f321d8 automated merge 2010-10-15 11:31:39 -07:00
Roxie Linden 2f9da36712 automated merge 2010-10-13 12:37:12 -07:00
Roxie Linden 17a04f8231 EVE-47 - Event formatting should appear in "Profile" window
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl
  EVE-72 - Modify viewer to make the event profile window be an html control

This is basically a reworking of the event profile display to remove all in-viewer
specific event display rendering, in preparation for richtext descriptions.
Most was removal of code.
2010-10-12 17:49:36 -07:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Linden 093e83386d merge 2010-08-26 12:49:00 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00