livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,776 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

142 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Dmitry Zaporozhan 0312156258 Fixed low bug EXT-3294 - Toasts bunch up in the channel when big docked IM window is opened. 
--HG--
branch : product-engine
 2009-12-25 13:53:11 +02:00
Alexei Arabadji 81cf50d3d3 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 
--HG--
branch : product-engine
 2009-12-22 20:15:51 +02:00
Alexei Arabadji c7b69713b7 fixed EXT-3564 “Docked windows hide when clicking on sidetray tabs”, 
added sidetray tab buttons panel to transient manager control list,
added right padding to the docking rect area to avoid overlapping docked IM
floaters with sidetray buttons;

--HG--
branch : product-engine
 2009-12-22 20:14:51 +02:00
Vadim Savchuk 65557cde70 Made the control panel in P2P IM sessions non-resizable (EXT-3470). 
--HG--
branch : product-engine
 2009-12-22 20:03:10 +02:00
James Cook eb501f3231 Merge, pulling in viewer-2-0 2009-12-18 10:50:29 -08:00
James Cook 6e17110201 EXT-3516 X Button should end IM session, _ button should hide 
I don't like it, but I don't have a better suggestion.
Reviewed with Steve.
 2009-12-17 16:09:41 -08: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
Alexei Arabadji f8f1252d32 mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby chat, should work as toggles”, 
made hide/unhide dockable floaters when undocked;

--HG--
branch : product-engine
 2009-12-15 09:55:00 +02:00
Igor Borovkov 222dfaef0a fixed EXT-3372 [BSI] Typing notification in IM displayed although Resident isn't typing 
Added explicit resetting of IM floater's title as it was done in 1.23

--HG--
branch : product-engine
 2009-12-14 16:43:34 +02:00
Igor Borovkov 0bd034c56a fixed EXT-3250 There should be no "Group info" button for Ad-hoc conference 
caused by misdetection of IM type

--HG--
branch : product-engine
 2009-12-10 15:42:54 +02:00
Dmitry Zaporozhan e6210e82d3 Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking. 
Improved functionality, cleaned code.

--HG--
branch : product-engine
 2009-12-08 12:17:10 +02:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 2d7697dfad automated merge 2010-02-26 01:52:28 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
Roxie Linden 92cef0426d automated merge from trunk 2010-02-25 11:33:56 -08:00
Dmitry Zaporozhan 3dee439c1d Implemented normal task EXT-3089 - Notification toasts positioning, layering and stacking. 
--HG--
branch : product-engine
 2009-12-07 19:23:34 +02:00
Paul Guslisty 8cd690bc1f Fixed normal bug EXT - 3074 (Resident name tabs in IM window should not be capitalized) 
--HG--
branch : product-engine
 2009-12-07 18:03:43 +02:00
Sergey Borushevsky 69a2843d5b Implemented normal task EXT-2833 ("Close" button should hide bottom bar windows) 
When IM floater isn't torn off, "Close" button is disabled.
It's not hidden, since there is a hack in LLFloater::updateButton.

--HG--
branch : product-engine
 2009-12-02 19:49:44 +02:00
Igor Borovkov e2ec9459cb fixed EXT-2938 (Log of not active IM floater isn't refreshed when IM session is in multitab mode) 
by employing setVisible for updating messaged

--HG--
branch : product-engine
 2009-12-02 16:53:00 +02:00
Dmitry Zaporozhan 9d8b189886 Implemented normal sub-task EXT-2975 - Make the IM multifloater optional. 
--HG--
branch : product-engine
 2009-12-02 14:18:40 +02:00
Sergey Borushevsky 3854305519 Fixed build after implementation of EXT-2882. 
Replaced LLNotifications::add call by LLNotificationsUtil::add.

--HG--
branch : product-engine
 2009-11-30 18:58:52 +02:00
Sergey Borushevsky cbab53ec39 Implemented major sub-task EXT-2882 (User who has been muted/unmuted by the moderator (that means, user is muted for the whole group) should receive a notification.) 
--HG--
branch : product-engine
 2009-11-30 17:47:20 +02:00
Andrew Polunin cf77bc1177 fixed normal bug EXT-2822 [BSI] IM chiclet floater always jumps to most recent chat 
--HG--
branch : product-engine
 2009-11-25 18:25:26 +02:00
Sergey Borushevsky 240c21cc2d Related to implementation of EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less)) 
- reverted changes in session processing code in LLIMFloater::onClose in rev. bd3f78cc1c42.

--HG--
branch : product-engine
 2009-11-24 20:34:05 +02:00
Sergey Borushevsky 9e403da7b0 Implemented major sub-task EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less)) 
--HG--
branch : product-engine
 2009-11-23 20:34:06 +02:00
Mike Antipov fb3b6145a8 Work on normal task EXT-2640 (Create a tabbed IM multifloater) 
- disable adding torn off IM Floaters into container when chiclet is clicked

--HG--
branch : product-engine
 2009-11-23 17:47:40 +02:00
Mike Antipov 11ef9f3d41 Work on normal task EXT-2640 (Create a tabbed IM multifloater) 
- disabled Transient & Dockable functionality of IM Floaters to do not have collisions with multifloater
- remove debug attributes in xml

--HG--
branch : product-engine
 2009-11-23 16:29:10 +02:00
Steve Bennetts 5acb165025 Change close behavior to not end session. 
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
 2009-11-18 18:08:59 -08:00
Steve Bennetts ff6eea998d Change close behavior to not end session. 
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
Also made the group IM floater a little less broken.
 2009-11-18 18:08:32 -08:00
James Cook 81eca4a782 merge 2009-11-18 15:05:04 -08:00
James Cook 5649faf6d9 merge 2009-11-18 14:33:09 -08:00
James Cook 203490e2a0 Change /me emote formatting to pure italics, not underlined. 
Review pending with Richard/Leyla
 2009-11-18 14:29:01 -08:00
James Cook 1a2694f92b merge 2009-11-18 09:12:54 -08:00
Eugene Kondrashev b3cb61a26a Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it was sent and received. Time str from the arriving message used now instead of constructing it dynamicly. 
--HG--
branch : product-engine
 2009-11-18 17:57:47 +02:00
richard d2fe3e8089 merge 2009-11-17 14:37:55 -08:00
Igor Borovkov a66aa0fd9a fixed major EXT-2551 Nearby Chat undocs after minimizing and opening (being docked before) 
--HG--
branch : product-engine
 2009-11-17 18:42:51 +02:00
Vadim Savchuk 7b10039d45 merge 
--HG--
branch : product-engine
 2009-11-17 16:41:08 +02:00
Vadim Savchuk 402e957c56 Merge from default branch. 
Added missing trailing newline to fix Linux build.

--HG--
branch : product-engine
 2009-11-17 16:36:22 +02:00
Igor Borovkov 0422eadf2a implemented major EXT-2523 The minimize button should hide undocked IM windows, not minimize them 
--HG--
branch : product-engine
 2009-11-17 16:28:47 +02:00
Alexei Arabadji d43e33400a implemented EXT-2515 "Docked floaters should be resizeable"; 
--HG--
branch : product-engine
 2009-11-17 14:33:07 +02:00
angela 0098bf40ea undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating 2009-11-17 16:33:49 +08:00
richard b38ca5ec32 fix for UI scale != 1.0 breaking edit tools, web browser, world view rect, etc. 2009-11-16 15:47:45 -08:00
angela 1baf1d2186 fix chat format for /me 2009-11-16 20:46:40 +08:00
James Cook e728dcd1ab merge 2009-11-13 12:38:53 -08:00
James Cook f9cacc57e2 EXT-2491 IM text does not appear in private IMs 2009-11-13 12:36:41 -08:00
Steve Bennetts b3b608b2a8 Merge from product-engine 2009-11-13 10:17:56 -08:00
angela a7b8b51a5a Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 15:20:04 +08:00
Igor Borovkov 4d616fdfae no ticket, removed misleading warning message about supposedly non-existent session 
--HG--
branch : product-engine
 2009-11-12 16:46:44 +02:00
angela ff09b049a7 merge 2009-11-12 21:36:34 +08:00
angela 11fc2da6fa make color and font affecting both nearby chat and toasts 2009-11-12 21:20:18 +08:00
Eugene Kondrashev a69ab24094 Fixed Low bug EXT-2345-There is wrong direction arrow in IM window, after this window has been closed and restored (refer to screenshot) 
--HG--
branch : product-engine
 2009-11-12 13:29:27 +02:00
Vadim Savchuk 6146cfc5c1 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 17:47:20 +02:00
Eugene Kondrashev 61fdd33f79 Fixed Low bug EXT-1052-IM message window show messages, that were sent in offline mode 
--HG--
branch : product-engine
 2009-11-11 16:11:57 +02:00
Eugene Kondrashev 2afc64e6fa Fixed Normal bug EXT-1959 - [BSI] emotes difficult to see in IM/Group chat 
--HG--
branch : product-engine
 2009-11-11 13:08:02 +02:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw) 
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
 2009-11-10 14:00:38 -08:00
Igor Borovkov a3830dee59 implement normal subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from 'Second Life', zero uuid) 
--HG--
branch : product-engine
 2009-11-06 17:03:48 +02:00
Eugene Kondrashev 0c95cc78e5 No ticket fixed dropped functionaliti by prev commit 
--HG--
branch : product-engine
 2009-11-06 15:48:27 +02:00
Eugene Kondrashev bc3377c1f6 Partial implementation of EXT-1906 All speakers handling functional in old IM Floaters (Communicate) should be present in new IM Floaters/IM control panels, EXCLUDING voice related mute/moderation stuff 
--HG--
branch : product-engine
 2009-11-06 14:49:35 +02:00
Sergey Borushevsky f59c8b5e4e Implemented normal task EXT-2149 (IM Text Editors should display grayed text "TO [avatar_name/group_name/ad-hoc conference]") 
--HG--
branch : product-engine
 2009-11-04 20:09:06 +02:00
Sergey Borushevsky de2fe92bb9 Fixed normal bug EXT-2150 (IM Floaters should display their title in CAPS (p2p, group, ad-hoc)). 
--HG--
branch : product-engine
 2009-11-03 21:58:09 +02:00
Igor Borovkov 01724523cf IM: defensive fix to get rid of warnings about attempts to get speaker mgr for removed sessions 
--HG--
branch : product-engine
 2009-11-03 13:15:15 +02:00
ayp 04d59cdace implemented major task EXT-1718 Add drag-&-drop functinality to the new IM Floaters 
--HG--
branch : product-engine
 2009-11-02 15:32:51 +02:00
Alexei Arabadji 8f59fb1773 fixed EXT-1914 "IM Floaters lost ANCHORS to their chiclets and are not dockable." 
--HG--
branch : product-engine
 2009-11-02 12:50:23 +02:00
Dmitry Oleshko 7dd9fb2806 fixed normal bug (EXT-1934) [BSI] Revert EXT-543 - Notification chiclet should not count IM/Group messages 
--HG--
branch : product-engine
 2009-10-30 14:18:07 +02:00
Sergey Borushevsky 12427e963e Implemented major task EXT-1695 (IM window should save profile image show/hide state). 
--HG--
branch : product-engine
 2009-10-29 22:32:35 +02:00
Sergey Borushevsky e724fa0ab4 Implemented major task EXT-1487 (Reimplement chat history persistence using LLSD serialization). 
Moved loading of IM history from LLIMFloater and LLFloaterIMPanel to LLModel::LLIMSession.
Implemented disabling of saving logs if it's disabled in Preferences.

--HG--
branch : product-engine
 2009-10-29 20:26:56 +02:00
Eugene Kondrashev 79738b2a65 Fixed normal bug EXT-1857-'Group Info' btn is unnecessary in Friends Conference floater 
--HG--
branch : product-engine
 2009-10-28 20:59:33 +02:00
Eugene Mutavchi a999e50a8e Implemented major sub-task EXT-1912 ( Add handling restrictions of PSTN P2P calls in new IM Floaters ) 
--HG--
branch : product-engine
 2009-10-28 16:14:52 +02:00
Eugene Mutavchi 33af464c44 Implemented major sub-task EXT-1904 (New IM floater should handle Session Update) 
--HG--
branch : product-engine
 2009-10-28 14:21:36 +02:00
Igor Borovkov 3eb7f84b10 IM: implemented task EXT-1905 (Add "Call" and "End Call" functionality to new IIM Floater) 
--HG--
branch : product-engine
 2009-10-27 18:01:41 +02:00
Igor Borovkov 6222149487 IM refactoring: moved voice channel related classes to its own llvoicechannel.* files from dying llimpanel.* files 
--HG--
branch : product-engine
 2009-10-27 13:16:44 +02:00
Yuri Chebotarev ychebotarev@productengine.com c377a4b6f4 merge 
--HG--
branch : product-engine
 2009-10-27 11:33:09 +02:00
Yuri Chebotarev ychebotarev@productengine.com 62c8f55e3e working on EXT-1713,EXT-1712,EXT-1711,EXT-1709 
EXT-1713 Nearby Chat: Objects have tooltips (???)(???)
EXT-1712 Nearby Chat: change context menu for objects
EXT-1711 Nearby Chat: context menu isn't applicable for system messages
EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only
initial commit - panel for message headers

--HG--
branch : product-engine
 2009-10-27 11:28:46 +02:00
Igor Borovkov 5892411348 merge 
--HG--
branch : product-engine
 2009-10-26 17:40:48 +02:00
Igor Borovkov e931d2d6f1 IM refac.: replaced passing copies by passing references, moved some IMModel private, added documentation 
--HG--
branch : product-engine
 2009-10-26 17:33:28 +02:00
Eugene Mutavchi f22f829b86 Fixed normal bugs EXT-1628 ([BSI] - New IM system isn't sending typing notifications anymore) and EXT-1629 ([BSI] - add hint in IM window when Resident is typing) 
--HG--
branch : product-engine
 2009-10-26 17:14:32 +02:00
Steven Bennetts b43771cad5 Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
 2009-10-23 17:20:45 +00:00
Steven Bennetts 6f41747bc4 Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
 2009-10-21 04:58:23 +00:00
Steven Bennetts 2c1aacf814 Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1609 EXT-1255 EXT-1299
 2009-10-21 04:47:55 +00:00
Steven Bennetts 8103710c05 Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253  EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
 2009-10-19 01:45:44 +00:00
Steven Bennetts 20e56a6925 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3 
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
 2009-10-13 16:25:48 +00:00
James Cook ec84b639ed EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard. 2009-10-07 20:54:31 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 2009-10-03 23:40:28 +00:00
Leyla Farazha 073a5df37c Merge fix, line was deleted. 2009-10-01 23:27:14 +00:00
Leyla Farazha 5143879a5b unborking build. 
fixed lltransientfloatermgr.cpp addFocusChangeCallback
commenting out LLFLoaterIM setFocusLostCallback for now.
 2009-10-01 23:03:50 +00:00
Steven Bennetts f05df68656 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)
 2009-10-01 17:44:44 +00:00
Richard Nelson 6c70154cd1 converted focus change callbacks to use signals 
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt

reviewed by Leyla
 2009-09-30 01:00:51 +00:00
Steven Bennetts 606b381c9f merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
 2009-09-29 19:37:05 +00:00