Commit Graph

396 Commits (7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c)

Author SHA1 Message Date
Oz Linden 8bfd3201de merge changes for latest viewer-development 2011-06-01 22:07:12 -04:00
Oz Linden 0eb13bb682 storm-1189: remove more of the code for classic clouds 2011-05-26 11:30:39 -04: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 c351b94723 merge changes for login-messages 2011-05-18 18:26:19 -04:00
Don Kjer 0a86e39d90 Merge with viewer-development (mesh) 2011-05-17 21:01:36 +00:00
Joshua Bell f440cd4af6 WIP viewer side of ER-864: comment change 2011-05-16 10:08:09 -07:00
Joshua Bell e54e9b4eed WIP: viewer side of ER-864: Include message ids and args in login.cgi responses
* Look for message_id and message_args in XMLRPC response, look up localized string in strings.xml
* Support sub-maps in XMLRPC response conversion to LLSD
* Explicitly request extended error info during login (since including sub-maps breaks older viewers)
* Support LLSD-based substitutions in LLTrans::getString/findString
2011-05-11 17:36:11 -07:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Oz Linden 9c995e2a5c merge up from viewer-development (with changes for storm-160 backed out) 2011-04-18 16:25:02 -04: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 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
Vadim ProductEngine 5a0547cdc3 STORM-1126 merge 2011-03-31 18:46:56 +03: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
Don Kjer 1e0608ff51 Merge with viewer-development 2011-03-23 01:26:03 +00: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
Don Kjer 6258f8d2e2 Merge with viewer-development 2011-03-14 20:18:09 +00:00
Dave SIMmONs bdd994d186 Get rid of un-used LLUUID. Reviewed by Kelly 2011-03-09 14:32:22 -08: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