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

133 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Eugene Mutavchi 06d5706cdc Implemented normal sub-task EXT-2478(Implement a chiclet for the llGiveInventory() processing) 
--HG--
branch : product-engine
 2009-12-01 22:30:04 +02:00
Sergey Borushevsky 32887cdc54 Implemented normal task EXT-2750 (Add context menu for group and ad-hoc chiclet) 
Added menu to ad-hoc chiclet, which contains one 'End Session' item.

--HG--
branch : product-engine
 2009-12-01 17:13:35 +02:00
richard cdb2232284 created container for LLFloaterView for future z-swapping with sidetray 
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 	Script editor automatically scrolls to the top of script text when text is longer than the window.

reviewed by James
 2009-11-25 18:24:39 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it 
Cuts number of includes of llnotifications.h from 300+ to 40.
 2009-11-25 01:15:50 -08:00
James Cook 0e351bedb6 Removed llnotifications.h from all headers by adding llnotificationsptr.h 
Fixed many more includes
 2009-11-24 22:55:56 -08:00
James Cook f9081220ac Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-24 08:47:13 -08:00
James Cook 620de712c4 merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp 2009-11-23 14:46:47 -08:00
richard 7fd1488c62 convert signals to allocate on demand in order to speed up widget construction 
reviewed by James
 2009-11-23 11:42:32 -08:00
Dmitry Zaporozhan 9f0dbcf4c0 Update for task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets. 
Cleaned code, added comments.

--HG--
branch : product-engine
 2009-11-23 15:50:49 +02:00
Dmitry Zaporozhan d0c1593d85 Merge 
--HG--
branch : product-engine
 2009-11-20 19:24:07 +02:00
Dmitry Zaporozhan 13a6077b78 Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets. 
Implemented LLDialog(LLScriptFloater) and Script Chiclets.

--HG--
branch : product-engine
 2009-11-20 19:17:38 +02:00
Vadim Savchuk 8cd7a2b5f4 merge 
--HG--
branch : product-engine
 2009-11-19 16:17:02 +02:00
Mike Antipov e40c3d247f No ticket. Updated comments to conform to the doxygen style 
--HG--
branch : product-engine
 2009-11-19 16:03:25 +02:00
Mike Antipov ef292e6a8b Fixed major bug EXT-2620 (IM Chiclet Panel goes crazy when new IM chiclets are added (chiclet scrolling appears with no need)) 
- refactored algotithm of caclulating position of the first chiclet in the list when adding new one.
 - added comments for LLChicketPanel::addChiclet() & LLChicketPanel::arrange() methods

--HG--
branch : product-engine
 2009-11-19 15:19:49 +02:00
Steve Bennetts 2878328bb7 Renamed "close" to "end" in chiclet context menus 
Removed "open" in chiclet context menus
Removed some deprecate "..."
Removed ^M from menu_viewer.xml
 2009-11-18 14:39:51 -08:00
Steve Bennetts 5fce305bc6 merge 2009-11-18 14:30:05 -08:00
Steve Bennetts efb512dc65 EXT-2644 - Add "Close Session" option to chicklet context menus 2009-11-18 14:07:35 -08:00
Mike Antipov c22a90669c Work on normal sub-task EXT-2553 (Change Sys well icon & Counter according to ALTERNATE design) 
- implemented counter next to the left from an envelope icon.
 - button now has fixed width for 3 digits.

--HG--
branch : product-engine
 2009-11-18 13:04:17 +02:00
Mike Antipov 75fe049b18 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
- code cleaned up, removed commented out & unused code
Functionality was not changed

--HG--
branch : product-engine
 2009-11-16 13:18:42 +02:00
Dmitry Oleshko 03a0b86335 fixed normal bug (EXT-2454) "Unread message" indicator isn't reset for chiclet in the Message Well after opening IM window 
added a check, whether a new message came, in order to prevent unwanted return from function, that makes impossible updating chiclets' states

--HG--
branch : product-engine
 2009-11-13 14:50:52 +02:00
Eugene Kondrashev 86c63e36b5 Fixed major bug EXT-2400-Viewer crashes on right button click upon IM P2P chiclet. Removed call to non-existing child 
--HG--
branch : product-engine
 2009-11-12 17:36:17 +02:00
Igor Borovkov 047eb37967 merge 
--HG--
branch : product-engine
 2009-11-12 15:27:22 +02:00
Igor Borovkov 2e01e2bfbd no ticket, fixed IM message counting and firing new message balloon 
--HG--
branch : product-engine
 2009-11-12 15:24:58 +02:00
Dmitry Oleshko 36e0f729d3 final fix for 
(EXT-989) IM chiclets should expand to show active voice indicator
(EXT-988) Change indication of unread messges in chiclets

fixed chiclets' behavior in the Message Well Window

--HG--
branch : product-engine
 2009-11-12 12:59:04 +02:00
Vadim Savchuk 2fd51b4c71 Manual merge. 
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.

--HG--
branch : product-engine
 2009-11-11 21:11:54 +02:00
Mike Antipov ee759fb32e merge 
--HG--
branch : product-engine
 2009-11-11 18:12:32 +02:00
Vadim Savchuk 6146cfc5c1 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 17:47:20 +02:00
Mike Antipov 51d35efa23 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code cleaned up:
  - removed test code to show background in chiclet panel

--HG--
branch : product-engine
 2009-11-11 17:05:31 +02:00
Alexei Arabadji eed0b3460b fixed EXT-2341 "Add Friend notification not shown", EXT-2351 "Friendship and 
Teleport offers no longer pop toast notifications";
suppresed IM-floater on incoming offer and registerd offer handler in chiclet
counter updater;

--HG--
branch : product-engine
 2009-11-11 12:09:46 +02:00
Steve Bennetts 98ca90bed4 Merge changes from product-engine 2009-11-10 17:52:28 -08:00
Alexei Arabadji c673ef4a91 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 
--HG--
branch : product-engine
 2009-11-10 18:47:00 +02:00
Alexei Arabadji 3a8c80a388 fixed EXT-2275 "[BSI] New incoming IM or Group IM pushes all existing (and 
new) chiclets off the right end of the chiclet bar."

--HG--
branch : product-engine
 2009-11-10 18:45:51 +02:00
Mike Antipov 3eafbeaac5 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Initial refactoring of functionality:
  - Re-Fixed bug with visibility of chiclet panel of the min size
  - updated bottomtray xml to make buttons identical to each other
  - Imroved logic while resizing of bottom tray (changing width of chiclet & nearby panels, hide/show buttons)

--HG--
branch : product-engine
 2009-11-10 15:02:42 +02:00
Andrew Dyukov e808f41baf Fixed line endings from 4df44e70aa9d 
--HG--
branch : product-engine
 2009-11-10 11:37:10 +02:00
Andrew Dyukov ff8fc7309a Fixed EXT-2104 (Chiclets overflow buttons overlap lower tray elements)- 
in this changeset and
 in 4466:3ad0401e16a5. Here I changed height of buuttons.

--HG--
branch : product-engine
 2009-11-09 22:23:28 +02:00
Andrew Dyukov 7e3cc13747 Fixed normal bug EXT-2103 (There are no arrow icons on the Chiclets overflow buttons), 
but Erica will have to set appropriate icon.

--HG--
branch : product-engine
 2009-11-09 19:07:15 +02:00
Dmitry Oleshko 92d3e335dc partial implementation for the major task (EXT-989) IM chiclets should expand to show active voice indicator 
--HG--
branch : product-engine
 2009-11-09 17:44:55 +02:00
richard 29d8ee76f1 LLChiclet cleans up its connection to LLTransientFloaterMgr now 
and panel_stand_stop_flying is visible by default while its contents are not
 2009-11-05 16:30:11 -08:00
Steve Bennetts 98229cbbcf Merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-11-05 11:41:25 -08:00
Dmitry Oleshko 341b6e4058 partial fix for a normal Sub-task (EXT-988) Change indication of unread messges in chiclets 
--HG--
branch : product-engine
 2009-11-05 20:29:01 +02:00
Tofu Linden 6d6fcc46ef Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' button which is broken on trunk. 2009-11-05 13:17:19 +00:00
Steve Bennetts af401ac6dc Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-11-04 19:15:12 -08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Tofu Linden 7573cb6112 split code. 2009-11-04 18:34:11 +00:00
Dmitry Oleshko 347f261480 implemented a normal Sub-task (EXT-988) Change indication of unread messges in chiclets 
--HG--
branch : product-engine
 2009-11-04 16:35:48 +02:00
Eugene Kondrashev 459e7e2684 Implemented normal subtask EXT-1516 - Implement chiclet for ad-hoc chat. 
--HG--
branch : product-engine
 2009-11-04 12:54:44 +02:00
Igor Borovkov 24179cbcc6 fixed normal EXT-1131 Message Well counts non-interactive notifications however chiclet-window is opened 
--HG--
branch : product-engine
 2009-11-03 14:25:08 +02:00
Denis Serdjuk 08f1e05552 fixed major bug EXT-1984 Speak button light should not disable when voice channel is open 
--HG--
branch : product-engine
 2009-11-02 21:51:39 +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
Igor Borovkov ea0abdac1d IM: cleaned up includes of old im floater stuff llimpanel.h 
--HG--
branch : product-engine
 2009-10-29 16:49:06 +02:00
Vadim Savchuk 10aa210e04 Partial implementation of normal priority task EXT-1096 (Implement recent time in recent people list). 
- Implemented display of last interaction time (e.g. 5m, 3d, 10w).
- Removed dead code for displaying avatar away/busy status.
TODO: i18n, visual fixes.

--HG--
branch : product-engine
 2009-10-28 23:59:51 +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 0041d485b1 Merging revisions 2129-2144 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 
* Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720
* Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
 2009-10-22 00:21:18 +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 fe9719e804 Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167
* Dev: EXT-1516
 2009-10-21 03:39:04 +00:00
Steven Bennetts b5ffeaff1a merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030
* New Dev: EXT-1293 EXT-1416
 2009-10-14 20:37:03 +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
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
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
James Cook 1b71689ad7 EXT-331 Speak button uses the "Pressed" state and not the "Active/Selected/On" state. Speak button was hard-coded to segmented-button art -- removed hard-coding so it uses normal button params. Also changed walk-mode and camera-mode icons to use green backgrounds, which emphasizes the radio-button aspect of the controls. Reviewed with Erica. 2009-09-22 23:24:20 +00:00
Steven Bennetts 7df79382a0 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835

QA: Please test Recent List to verify it has no troubles.
 2009-09-11 23:50:59 +00:00
Steven Bennetts ccb1d2b1e4 merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
 2009-09-10 03:12:12 +00:00
Steven Bennetts 4601aef70a merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
 2009-09-09 04:27:06 +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
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Steven Bennetts 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
 2009-09-07 22:55:07 +00:00
Steven Bennetts 5612f13dc8 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 
* Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801
* New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
 2009-09-02 02:59:07 +00:00
Steven Bennetts af98aad98d svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
 2009-08-26 20:47:27 +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
Steven Bennetts 73caee4208 svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3 
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
 2009-08-14 21:50:02 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
 2009-08-12 01:12:27 +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
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +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
Steven Bennetts cef46d1645 merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3 2009-07-21 00:59:14 +00:00
Steven Bennetts 73a97010e6 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-07-21 00:57:23 +00:00
James Cook 91f9835176 DEV-35118 Converted voice volume feedback icon on bottom tray to use real artwork. Converted LLOutputMonitorCtrl to use ParamBlocks to specify art. Added output_monitor.xml to specify art. Bottom bar gives volume feedback even when triggering voice with middle-mouse or keyboard binding. Reviewed with Richard. 2009-07-10 00:23:41 +00:00
Steven Bennetts f26f7e3e29 merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
 2009-07-08 05:19:19 +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
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
 2009-07-06 21:58:04 +00:00
Steven Bennetts 39905b927d merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 2009-07-02 00:38:13 +00:00
Nat Goodspeed fcaa1ad46f QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to 
Boost.Signals2 like the rest of the event-system-n code.
 2009-06-22 12:52:18 +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