Commit Graph

5508 Commits (3f07a635c877332ecd49efef4d83da1e856a4fc9)

Author SHA1 Message Date
Lynx Linden 3f07a635c8 DEV-44861: Support a home_sidetray_url from login.cgi
The URL for the Home side tray is specified in settings.xml. It can
now be overriden on a grid-level via a "home_sidetray_url" token sent
by login.cgi.

I also updated the Home URL in settings.xml to pass through a bunch of
information to the web server as query params. These include:

p= : the authentication token from login.cgi
lang= : the user's current two-letter language setting
channel= : the viewer's channel name, e.g., "Second Life Beta",
"Second Life Release", "Snowglobe", etc.
version= : the viewer's version number, e.g., "2.0.0.200712"
major= : the viewer's major version number, e.g. "2"
minor= : the viewer's minor version number, e.g. "0"
2010-01-13 11:06:50 +00:00
Lynx Linden abc190525f EXT-4021: Updated help ID for LSL Reference floater 2010-01-13 10:35:29 +00:00
Lynx Linden 82d26e6622 EXT-3384: Added the final URLs for the Buy L$ links.
Payment Method:
 http://www.secondlife.com/my/account/payment_method_management.php
Currency:
 http://www.secondlife.com/my/account/currency.php
2010-01-13 10:06:55 +00:00
Nat Goodspeed aa914ce948 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-12 23:14:55 -05:00
Nat Goodspeed 7b03037cac EXT-4193: Use different reply pumps for SRV and XMLRPC requests.
This eliminates the timing hole (introduced by EXT-3934 fix) in which a
belated SRV response could confuse the XMLRPC response code.
Extend unit tests to positively drive the bug and validate the fix.
2010-01-12 15:27:01 -05:00
Dave Parks 3d2506abe7 EXT-1331 Fix for avatars not rendering after they are loaded until camera is moved. 2010-01-12 13:53:25 -06:00
Dave Parks 86f1baf836 Merge 2010-01-12 12:02:40 -06:00
Dave Parks 41daf99e19 DEV-44675 Fix for sky wierdness on ATI 9.12 drivers. 2010-01-12 12:01:18 -06:00
Brad Payne (Vir Linden) a148eb8979 merge 2010-01-12 08:53:34 -05:00
Brad Payne (Vir Linden) e8b3445407 Removed some diagnostic code that got inadvertently left in 2010-01-12 08:52:51 -05:00
Monroe Linden 3b2697cb93 Fix for black/grey look at login screen and backspace going back in search/help windows. This should address EXT-4097.
Added a notion of "background color" to LLViewerMediaImpl and LLPluginClassMedia.
Added background color parameters to the size_change message.
Webkit plugin now sets the background color of the instance from the supplied background color, and navigates to a data: url with that background color instead of about:blank as its initial navigate.
Webkit plugin now no longer waits for the first onPageChanged event
LLViewerMediaImpl now clears the texture to the background color when initializing it.
Made LLMediaCtrl fill with its opaque background color when the media impl isn't set up yet.
Removed the initial data URL from the search and help floaters, since what it was doing is now handled internally by the new background color code.

Reviewed by callum and rick.
2010-01-11 17:54:05 -08:00
Xiaohong Bao 05cbb2b46b Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-11 16:23:45 -08:00
Xiaohong Bao 2aa67af38e fix for EXT-4164: llrender/llimagegl.cpp(1111): ASSERT(mCurrentDiscardLevel>=0) 2010-01-11 16:23:14 -08:00
Rick Pasetto 4b8d390669 merge 2010-01-11 15:38:44 -08:00
Rick Pasetto e4b7deae75 FIX EXT-3972: Don't put up the "multiple media" dialog just because the user doesn't have the "Select Face" tool selected. 2010-01-11 15:38:26 -08:00
Tofu Linden 1dd4feee4f Avoid an assertion failure in texture baking. Reviewed by Nyx. Deemed 'tiny'... 2010-01-11 15:38:17 -08:00
Tofu Linden 0ab0bea009 Merge. 2010-01-11 14:41:22 -08:00
Tofu Linden cbc0674a7a EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds 2010-01-11 14:35:39 -08:00
Brad Payne (Vir Linden) 2a65ae2249 merge 2010-01-11 17:33:00 -05:00
James Cook fb9a20802f Better resolution of merge conflict 2010-01-11 14:18:43 -08:00
Brad Payne (Vir Linden) 377ed93543 merge 2010-01-11 17:16:47 -05:00
James Cook a36087f5c1 Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp 2010-01-11 14:06:09 -08:00
James Cook a570c39bd3 Merge 2010-01-11 14:00:49 -08:00
James Cook ba1f246503 EXT-3687 Inventory and Outfits lists don't fill panel need DkGray2 background
EXT-4044 Inventory and Outfits scroll region has no background color/border
Moved background color initialization to inventory_panel.xml
Fixed search highlight color and extra borders no longer needed now that colors
are correct.  Reviewed with Simon.
2010-01-11 13:58:42 -08:00
Brad Payne (Vir Linden) ca97039e75 merge 2010-01-11 16:36:53 -05:00
Brad Payne (Vir Linden) 8f4c2a59db For EXT-4068: [BSI] right click several times on an inventory item produces several second hang. Improved speed of panel finding by restricting search to only panels, saving time when inventory is very large 2010-01-11 16:36:27 -05:00
Lis Linden 09dc1af21c ext-3820 [BSI] Preferences > Chat > Show IMs In: does not take effect without restart 2010-01-11 16:26:22 -05:00
Lis Linden 81cde841c2 ext-4015 Preferences: non-standard position of field labels 2010-01-11 15:53:55 -05:00
Loren Shih 370a8592ac automated merge viewer2.0->viewer2.0 2010-01-11 15:15:11 -05:00
Lis Linden 29695bd08a Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2010-01-11 15:07:31 -05:00
Lis Linden 572424ffac ext-4116 bad label position on Region/Estate/ Ground Textures 2010-01-11 15:06:59 -05:00
James Cook bbcbed2539 Merge 2010-01-11 12:02:25 -08:00
James Cook 6473dbf588 EXT-3695, EXT-2034 Line height, padding in inventory customizable in XUI via
folder_view_item.xml
EXT-3753 Inventory folders now have customizable item indents and
"My Inventory" has indent again
Reviewed with Richard
2010-01-11 11:58:56 -08:00
Callum Prentice 832f135fd2 Merge with tip 2010-01-11 11:39:32 -08:00
Callum Prentice 817798ece0 Fix for EXT-3991 - "add url to security for MoAP floater is devoid of standard floater information" 2010-01-11 11:38:34 -08:00
Loren Shih 79542fe8e7 EXT-4154 : Memory leak from FetchObservers in AppearanceSP
Member observers of LLSidepanelAppearance are now deleted appropriately.
2010-01-11 14:15:32 -05:00
Erica 77f799b23a Automated merge with ssh://hg.lindenlab.com/james/gooey 2010-01-11 11:08:55 -08:00
Erica 20c01befd2 New art for landmarks and places - replacing the pushpin with a globe - reviewed with esbee 2010-01-11 11:07:18 -08:00
Lis Linden b4ae773378 Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2010-01-11 14:04:49 -05:00
Lis Linden 6fc0731319 ext-3910 Instant Messages isn't in ALL CAPS like other windows 2010-01-11 14:04:06 -05:00
Rick Pasetto 158005d5ec Merge backout of b6030bb6ff40 2010-01-11 10:04:04 -08:00
Rick Pasetto dd86113567 Backed out changeset b6030bb6ff40 2010-01-11 10:03:00 -08:00
Rick Pasetto c0c1d91c87 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-11 09:55:20 -08:00
Rick Pasetto 0b63977570 Fix build issue with ba93e704bd4f 2010-01-11 09:53:24 -08:00
Runitai 78cb4204a4 Merge 2010-01-11 11:24:04 -06:00
Runitai 2a00a16f57 EXT-3784 Fix for first menu item going blank when highlighted on ATI cards. 2010-01-11 11:21:52 -06:00
James Cook e417d8fd25 Merge 2010-01-11 09:01:01 -08:00
Lynx Linden fddc7d856e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-11 17:00:02 +00:00
Lynx Linden a2c08d8e86 EXT-3429: Don't display inspect slider when inappropriate.
The avatar inspector has a volume slider and mute button. We make
these widgets invisible when it does not makes sense to interact with
them. That is, when the inspector is for your own avatar, or when
voice is not active.
2010-01-11 16:59:28 +00:00
Nyx (Neal Orman) 2073945b23 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-11 10:58:18 -05:00