Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Igor Borovkov ae405adbfe merge
--HG--
branch : product-engine
2009-12-18 18:04:41 +02:00
Dmitry Oleshko ced655cbff partial implementation for major task (EXT-2211) Add textual indication (IM messages) about incoming voice calls and reactions on them (All types of IMs)
- added notifications for group/adhoc calls

--HG--
branch : product-engine
2009-12-18 17:56:49 +02:00
Igor Borovkov 5dfc8d4c84 merge
--HG--
branch : product-engine
2009-12-18 17:41:01 +02:00
Denis Serdjuk a0373dc565 fixed critical bug EXT-3559 Crash when deleting last Favorites entry
Cause:
An error of invalid array index.
Solution:
Additional check has been added.

--HG--
branch : product-engine
2009-12-18 17:40:18 +02:00
Igor Borovkov f7fadaa807 completed EXT-3545 Voice controls panel should auto-open on starting call w/o text chat
--HG--
branch : product-engine
2009-12-18 17:39:01 +02:00
Igor Borovkov b28de65a8b corrected outgoing call dialog
--HG--
branch : product-engine
2009-12-18 17:27:58 +02:00
Igor Borovkov 715b2758ca reverted current voice channel changes notification time
--HG--
branch : product-engine
2009-12-18 17:21:14 +02:00
Loren Shih ad6d0e3bb7 automated merge viewer2.0->viewer2.0 2009-12-18 10:16:53 -05:00
Eugene Mutavchi a09c2ba7ac Major task EXT-3466 (Add avatars context menu for nearby voice chat in the voice control panel)
--HG--
branch : product-engine
2009-12-18 17:15:54 +02:00
Vadim Savchuk caab41523d IM floater: Made P2P IM control panel resizable (added "follows" flags).
This is an additional fix for task EXT-3470.

--HG--
branch : product-engine
2009-12-18 17:09:05 +02:00
Vadim Savchuk e0b2fbbf79 Fixed stall on startup: removed references to Arrow_Left and Arrow_Right images (which don't exist and are unused anyway) from textures.xml.
--HG--
branch : product-engine
2009-12-18 17:07:27 +02:00
Paul Guslisty 7cf60a0d57 Fixed normal bug EXT - 2863 ([BSI] Group Chat List Names right click do not contain view profile or send private message)
--HG--
branch : product-engine
2009-12-18 16:44:16 +02:00
Vadim Savchuk 0b835fe160 Fixed Linux build.
--HG--
branch : product-engine
2009-12-18 16:33:58 +02:00
Dmitry Oleshko f3a92bfc17 implemented major task (EXT-3354) Add "unread message" counters for IM sessions in the IM well window
- IM Well Window's chiclets now have counters and count IMs from 1 to "99+"
- IM Well Window's items can resize on appearance of chiclet's counter or speaker indicator

--HG--
branch : product-engine
2009-12-18 15:58:37 +02:00
Andrew Polunin 55ff23cdad implemented major task EXT-3469 Make timestamp disappear instead of covering avatar name while IM floater is being resized
--HG--
branch : product-engine
2009-12-18 15:47:21 +02:00
Denis Serdjuk bde0540ab5 implemented major task EXT-3509 User's own name should appear in the Group chat participant list
--HG--
branch : product-engine
2009-12-18 15:35:51 +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
Mike Antipov 4b9c365b44 Renamed method to reflect what it does
--HG--
branch : product-engine
2009-12-18 14:00:00 +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
Loren Shih 0561b09a7d EXT-3126 : Avatar Textures (Debug) floater is too huge to fit screen
Added horizontal and vertical scrollbars.
2009-12-17 22:03:52 -05:00
Loren Shih 8ced6cae88 EXT-3559 : Crash when deleting last Favorites entry
Map accessor was not checking for NULL.
2009-12-17 21:51:10 -05:00
Loren Shih cd276a208b EXT-1607 : Trash and Gear buttons are enabled when nothing is selected
UI wasn't being updated when nothing is selected.
2009-12-17 21:16:54 -05:00
Loren Shih 541f7f88c2 EXT-3557 : CTRL+I should bring up either InventorySP or InventoryFloater
Hitting CTRL+I when InventorySP is open will now bring up InventoryFloaters.
2009-12-17 21:01:10 -05:00
Monroe Linden eb7bd0a214 Changed default launch timeout in LLPluginProcessParent to 60 seconds, and added an to LLPluginProcessParent that allows callers to adjust the launch and lockup timeouts. 2009-12-17 18:00:59 -08: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
Monroe Linden 252ccc48a0 New mac llqtwebkit built from revision 3e60e0d929ff in hg.lindenlab.com/monroe/llqtwebkit-4.6 .
I believe this should fix the following issues:

DEV-44406 (login screen occasionally remains black/grey with no background image)
DEV-44449 (Mac webkit will not navigate to certain sites)
2009-12-17 17:11:05 -08: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
Leyla Farazha 10d2b4a1d5 merge 2009-12-17 17:02:38 -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
Leyla Farazha 94a86f13b6 removing mCancelOnClose 2009-12-17 16:25:33 -08:00
Leyla Farazha 43ed40f976 merge 2009-12-17 16:23:29 -08:00
richard 20392e15f0 merge 2009-12-17 16:23:08 -08:00
richard b2b8df6580 reverted to viewer-2 copy of sidepanel_item_info.xml 2009-12-17 16:22:03 -08: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
Erica 61310dc628 Automated merge with ssh://hg.lindenlab.com/james/gooey 2009-12-17 16:18:58 -08:00
Erica 4ac31ec10b Chuck's edits to the appearance editor 2009-12-17 16:18:40 -08:00