e6c2b2b87c
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-13 13:38:24 +02:00
abc190525f
EXT-4021: Updated help ID for LSL Reference floater
2010-01-13 10:35:29 +00:00
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
aa914ce948
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-12 23:14:55 -05:00
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
3d2506abe7
EXT-1331 Fix for avatars not rendering after they are loaded until camera is moved.
2010-01-12 13:53:25 -06:00
a619f9c307
Fixed normal bug EXT-3865 ([BSI] dock and undocking an IM or group chat makes the close button disable)
...
- removed overridden LLIMFloater::setTornOff functionality to not disable close button
--HG--
branch : product-engine
2010-01-12 20:22:28 +02:00
86f1baf836
Merge
2010-01-12 12:02:40 -06:00
41daf99e19
DEV-44675 Fix for sky wierdness on ATI 9.12 drivers.
2010-01-12 12:01:18 -06:00
1f5e82e140
Partially fixed major bug EXT-4112 ([BSI] Number of groups not limited to 25).
...
Viewer now disallows joining or creating groups if the limit reached.
A server-side fix is also needed.
--HG--
branch : product-engine
2010-01-12 20:01:10 +02:00
628b892a66
Completed low task EXT-3759 (NOTFORBETA0: Phone numbers for AvaLine calls should be human readable)
...
- implemented formatting of avaline Number in the "Leaving call" notification
--HG--
branch : product-engine
2010-01-12 19:57:17 +02:00
f0bbe78837
added missing no_group_text string constant to panel_my_profile.xml
...
--HG--
branch : product-engine
2010-01-12 18:33:43 +02:00
a10fb56c37
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-01-12 17:40:06 +02:00
fb7f1a5d24
fixed major EXT-3992 [BSI] No notification about capped messages,
...
replaced logging to obsolete LLFloaterChat with posting notification system message;
--HG--
branch : product-engine
2010-01-12 17:39:51 +02:00
85467c0ba6
Fixed major bug EXT-4121 ([BSI] Partner display is blank for residents on your friends list, on the first lookup after login)
...
--HG--
branch : product-engine
2010-01-12 17:27:36 +02:00
7fffe078eb
Fix for normal bug EXT-4134 - Right side of llDialog buttons cannot be clicked.
...
--HG--
branch : product-engine
2010-01-12 15:57:23 +02:00
a148eb8979
merge
2010-01-12 08:53:34 -05:00
e8b3445407
Removed some diagnostic code that got inadvertently left in
2010-01-12 08:52:51 -05:00
6ea8552289
Fix for normal bug EXT-4149 - Crash in Group Profile - Create New Notice interface.
...
--HG--
branch : product-engine
2010-01-12 14:58:28 +02:00
305cc64969
Fixed normal bug EXT-4150([BSI] Last Landmark in Teleport History disables teleport button)
...
--HG--
branch : product-engine
2010-01-12 14:28:21 +02:00
ba320f7ca4
Fix for major bug EXT-4147 - Cannot click on Urls in LLExpandableTextBox objects.
...
--HG--
branch : product-engine
2010-01-12 13:24:33 +02:00
94880f98fd
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-01-12 12:59:37 +02:00
3c3271761b
Merge with default branch, resolved conflict in llpanelavatar.cpp
...
--HG--
branch : product-engine
2010-01-12 12:53:44 +02:00
bcb054970c
Update for normal bug EXT-3520 - Can't open Group Notices or Attachments.
...
--HG--
branch : product-engine
2010-01-12 12:38:03 +02:00
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
05cbb2b46b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-01-11 16:23:45 -08:00
2aa67af38e
fix for EXT-4164: llrender/llimagegl.cpp(1111): ASSERT(mCurrentDiscardLevel>=0)
2010-01-11 16:23:14 -08:00
4b8d390669
merge
2010-01-11 15:38:44 -08:00
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
1dd4feee4f
Avoid an assertion failure in texture baking. Reviewed by Nyx. Deemed 'tiny'...
2010-01-11 15:38:17 -08:00
0ab0bea009
Merge.
2010-01-11 14:41:22 -08:00
cbc0674a7a
EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds
2010-01-11 14:35:39 -08:00
2a65ae2249
merge
2010-01-11 17:33:00 -05:00
fb9a20802f
Better resolution of merge conflict
2010-01-11 14:18:43 -08:00
377ed93543
merge
2010-01-11 17:16:47 -05:00
a36087f5c1
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
2010-01-11 14:06:09 -08:00
a570c39bd3
Merge
2010-01-11 14:00:49 -08:00
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
ca97039e75
merge
2010-01-11 16:36:53 -05:00
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
09dc1af21c
ext-3820 [BSI] Preferences > Chat > Show IMs In: does not take effect without restart
2010-01-11 16:26:22 -05:00
81cde841c2
ext-4015 Preferences: non-standard position of field labels
2010-01-11 15:53:55 -05:00
370a8592ac
automated merge viewer2.0->viewer2.0
2010-01-11 15:15:11 -05:00
29695bd08a
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2010-01-11 15:07:31 -05:00
13148203a4
Fixed normal bug EXT-3672 (OSX specific: Notification "calling to ..." doesn't disappear after the voice call has been accepted)
...
--HG--
branch : product-engine
2010-01-11 22:07:14 +02:00
572424ffac
ext-4116 bad label position on Region/Estate/ Ground Textures
2010-01-11 15:06:59 -05:00
bbcbed2539
Merge
2010-01-11 12:02:25 -08:00
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
832f135fd2
Merge with tip
2010-01-11 11:39:32 -08:00
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
Vadim Savchuk