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

41 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Mike Antipov c3f2859c9f Reduced header dependency from the "llimview.h" 
--HG--
branch : product-engine
 2009-12-26 16:35:33 +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 Mutavchi bfc9445563 Implemented major task EXT-1717 (IM related server responses processing stuff should use new IM floater along with the old one) sub-task of EXT-96 (Viewer 2009: Group IM detail). 
--HG--
branch : product-engine
 2009-10-27 14:29:18 +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
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 57fca109ca Merging revisions 2107-2109 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1557
 2009-10-21 04:50:52 +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
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
Steven Bennetts 579d8447d3 merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3 
* Bugs: EXT-838 EXT-815 EXT-872
* New Dev: IM Floater Docking
 2009-09-09 04:12:50 +00:00
James Cook 6bcf7a6fe6 EXT-592 IM chat is not updated for the first text message. PE added LLIMFloater::toggle() to show and hide the IM window when chiclets were clicked. This was not invoking the custom logic in LLIMFloater::show() that causes the message list to update. Reviewed with Leyla. 2009-08-19 18:43:46 +00:00
Steven Bennetts 0710d0da2b merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3 
EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
 2009-08-18 16:54:34 +00:00
James Cook 22fef0515f EXT-495 IM windows don't autoscroll. Added track_bottom param to floater_im_session.xml text editor, as I believe there is an implicit reshape happening in the dialog. Also made the divider lines showing usernames for each IM suppress duplicates, more like local chat history. Reviewed with Leyla. 2009-08-18 00:05:35 +00:00
Steven Bennetts faafa7405f merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3 
* EXT-449 EXT-131 EXT-464
* People and Places panel layout changes
* Some I18N fixes, test language
* Updated group panels following proposed new design
* made ims easier to read by color coding
 2009-08-13 04:40:19 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
 2009-07-27 17:56:26 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
 2009-07-07 00:53:05 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Monroe Williams 5dfd435872 svn merge -r 114639:114640 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-1361 
Merging in QAR-1361.
 2009-03-19 19:18:07 +00:00
Monroe Williams dd437009e8 svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323 
Merging in QAR-1323.
 2009-02-27 21:01:19 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
James Cook 36fccc3888 svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa). 2008-04-30 23:30:09 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
 2008-03-04 16:59:57 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 
QAR-290 = QAR-271 + QAR-191
 2008-02-19 21:42:32 +00:00
Jon Wolk 7dd08303a3 svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 2007-12-19 00:56:59 +00:00
Jon Wolk 94bcd2c47d svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code. 2007-10-22 18:17:47 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Josh Bell e3d0761b5e svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 
Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.
 2007-09-17 16:01:11 +00:00
Don Kjer 13c391f198 EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance 
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
 2007-09-14 21:13:20 +00:00
Monroe Williams 7138fb673a Merge down from Branch_1-18-1: 
svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
 2007-08-02 01:18:34 +00:00
Bryan O'Sullivan ce7682c2a4 svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
 2007-07-18 21:22:40 +00:00
Don Kjer e5124431b5 svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
Aaron Brashears f118e7c80b result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
Josh Bell ea8fb7238e svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-31 01:41:19 +00:00
Josh Bell 7dada07dba svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-02-20 22:02:36 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00