Yuri Chebotarev
2fd6bb4b59
fix for low Task EXT-2881 Enough space to place 5 chiclets without arrows in bottom bar when voice indicator isn't shown
...
change whole chicklet arranging.
--HG--
branch : product-engine
2009-12-21 12:11:26 +02:00
Yuri Chebotarev
d1a857de1f
merge
...
--HG--
branch : product-engine
2009-12-18 14:57:26 +02:00
Yuri Chebotarev
198587423d
merge
...
--HG--
branch : product-engine
2009-12-18 14:38:46 +02:00
Yuri Chebotarev
3bf89afebe
fix Task EXT-1190 Accordion should support keyboard accessability
...
--HG--
branch : product-engine
2009-12-18 14:36:22 +02:00
Eugene Mutavchi
5f237f8559
Implemented major sub-task EXT-3525 (Context menu for Notifications well)
...
--HG--
branch : product-engine
2009-12-18 14:01:18 +02:00
Vadim Savchuk
2a49de3bef
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-18 13:52:05 +02:00
Paul Guslisty
688e66fe29
Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places panel)
...
--HG--
branch : product-engine
2009-12-18 12:33:25 +02:00
Mark Palange (Mani)
ad65fa11ac
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-17 17:52:46 -08:00
Mark Palange (Mani)
18eea99b55
EXT-3536 Bugfix in lllogin.cpp when reading 'indeterminate' repsonse from login.cgi.
...
Also fixed up lllogin unit test to match the bugfix.
Reviewed by Brad
2009-12-17 17:52:06 -08:00
Tofu Linden
590187cd1d
Merge.
2009-12-17 17:47:41 -08:00
Tofu Linden
d8a574ce57
DEV-43898 Enable Flash-on-a-prim on Linux. Yowza!
2009-12-17 17:43:31 -08:00
Loren Shih
32aea4e72d
EXT-3552 : Opening a box and copy the items to inventroy also opens an inventory floater
...
InventorySP/InventoryFloater open behavior now follows 2.0 conventions -- sidepanel will open in preference to floater.
2009-12-17 20:33:50 -05:00
Tofu Linden
4bc23bc07d
merge.
2009-12-17 17:06:05 -08:00
Tofu Linden
b7ddd2e4fe
Fix a code comment now that we enable NSAPI plugins under Darwin.
2009-12-17 17:05:04 -08:00
Loren Shih
e7cccb0868
automated merge viewer2.0->viewer2.0
2009-12-17 19:54:47 -05:00
Tofu Linden
7105ad1def
Merge.
2009-12-17 16:48:53 -08:00
Tofu Linden
e75242fd56
Rebuild linux qt+llqtwebkit.
...
DEV-44461 linux qt/webkit rebuild again - girish snap 2009-12-17
DEV-44368 Linux MoaP viewer sees a blank 404 page on secondlife.com
2009-12-17 16:48:04 -08:00
Loren Shih
a08467ae26
automated merge viewer2.0->viewer2.0
2009-12-17 19:46:00 -05:00
Loren Shih
e1c839f16d
dos2unix line ending fix for llviewermenufile.cpp.
2009-12-17 19:44:59 -05:00
Steve Bennetts
b29b9c9619
Merge
2009-12-17 16:21:54 -08:00
Steve Bennetts
abe0eb2ba7
HTTP Texture changes:
...
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping
* Fixed an issue that was preventing retries on 503 errors
* Added number of pending creates to Texture View
* Increased time allocated for texture creates
2009-12-17 16:19:00 -08:00
Loren Shih
6580d70412
dos2unix line ending fix for llviewermenufile.cpp
...
--HG--
branch : avatar-pipeline
2009-12-17 19:09:37 -05:00
Loren Shih
36634bc1ec
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-17 18:55:01 -05:00
Loren Shih
6b065789c0
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-17 18:53:01 -05:00
Loren Shih
03c75c22f9
EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
...
"Delete" no longer works for system folders.
Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected.
--HG--
branch : avatar-pipeline
2009-12-17 18:47:58 -05:00
Steve Bennetts
74b36a4cf1
revert -3 6510 sidepanel_item_info.xml
2009-12-17 15:24:04 -08:00
Sergey Borushevsky
78d48def6b
Fixed normal bug EXT-637 (Please, add tooltips with a full names of the landmraks in the Favor bar / Overflow menu)
...
Fixed problem with overlapping of tool tip by menu.
--HG--
branch : product-engine
2009-12-18 00:45:35 +02:00
Nyx (Neal Orman)
bad019313a
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-12-17 16:27:14 -05:00
Nyx (Neal Orman)
9abe3c5814
EXT-3551 make outfit functionality non-discoverable
...
removed + button, added make outfit button.
make outfit button is only enabled if the "my outfits" tab is selected.
Code reviewed by Vir
--HG--
branch : avatar-pipeline
2009-12-17 16:26:04 -05:00
Loren Shih
49cb11010e
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-17 16:05:52 -05:00
Loren Shih
d3d454988a
EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items in the folder
...
Now checking contents of the folder for any actively worn items for determining this flag.
--HG--
branch : avatar-pipeline
2009-12-17 15:47:07 -05:00
Loren Shih
1f750b2066
pe -> viewer2.0 merge
2009-12-17 15:25:34 -05:00
Loren Shih
3c38c7f148
EXT-1634 : Block collapse/expand of accordion "root" folder by keyword
...
Hidden folders are no longer allowed to be selected.
--HG--
branch : avatar-pipeline
2009-12-17 15:21:14 -05:00
skolb
967652a705
Merge
2009-12-17 11:39:35 -08:00
Eric M. Tulla (BigPapi)
39700f104b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-17 13:45:13 -05:00
Eric M. Tulla (BigPapi)
27fda6c35f
EXT-2636: we now show "Loading..." before the my inventory named folder when doing a background fetch.
2009-12-17 13:40:57 -05:00
Brad Payne (Vir Linden)
c3522ef0ce
merge
...
--HG--
branch : avatar-pipeline
2009-12-17 13:16:17 -05:00
Brad Payne (Vir Linden)
bc2b796811
For EXT-3500: Make InventorySP and AppearanceSP filters behave like it does in LandmarksSP and PeopleSP. This covers AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-17 13:07:16 -05:00
skolb
c9a70e8675
Merge
2009-12-17 09:38:52 -08:00
skolb
cbbd8dcf22
local merge
2009-12-17 09:28:49 -08:00
skolb
f713efe298
Merge
2009-12-17 09:26:33 -08:00
Igor Borovkov
de3c63c339
merge
...
--HG--
branch : product-engine
2009-12-17 19:07:52 +02:00
Igor Borovkov
2fc7c967a4
corrected IM well counter EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
...
Now IM Well counter displays unread messages calculating it based on chiclets instead of displaying unread messages across all IM Model
--HG--
branch : product-engine
2009-12-17 19:07:01 +02:00
Mike Antipov
08c5a509d3
Fixed normal bug EXT-3542 (Avatar blocked "by text" looks confusing)
...
-- implemented reaction of Speaker indicator only on voice blocking
--HG--
branch : product-engine
2009-12-17 19:06:21 +02:00
Alexei Arabadji
f10fc0e72c
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-17 18:52:08 +02:00
Alexei Arabadji
b0b796cb05
implemented EXT-3512 “Add tool-tip to avatar name”;
...
--HG--
branch : product-engine
2009-12-17 18:50:59 +02:00
Mike Antipov
e0855e5249
Fixed major bug EXT-3498 (Sorting not working correctly in Favorites Bar)
...
- added sorting of Favorites items before reordering
--HG--
branch : product-engine
2009-12-17 18:34:50 +02:00
Igor Borovkov
b0e984e58a
merge
...
--HG--
branch : product-engine
2009-12-17 17:50:06 +02:00
Igor Borovkov
30f3397e35
fix. EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
...
correct chiclet handling functionality in IM when im session is started as voice call
--HG--
branch : product-engine
2009-12-17 17:49:08 +02:00
Brad Payne (Vir Linden)
8c5a13c370
For EXT-3500: Make InventorySP and AppearanceSP filters behave like it does in LandmarksSP and PeopleSP. This covers the InventorySP part.
...
--HG--
branch : avatar-pipeline
2009-12-17 10:20:55 -05:00