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

131 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Igor Borovkov eb4f026181 implemented EXT-3594 IM Chiclet should be created for voice calls also 
--HG--
branch : product-engine
 2009-12-21 15:18:48 +02:00
Eugene Mutavchi 8246111b12 Fixed normal bug EXT-3570 (IM Well Chiclet's counter is not reset when IM session with unread IMs is removed) 
--HG--
branch : product-engine
 2009-12-18 19:26:49 +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
Igor Borovkov 9dd2b29031 fixed EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group) 
Added flag to an LLIMSession which indicated whether it has been created for a voice call.

--HG--
branch : product-engine
 2009-12-16 15:30:33 +02:00
Roxie Linden 1147cb1afb Automated merge from trunk 2010-03-01 18:09:04 -08: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 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden 6bb43e1369 Automated merge up from viewer 2.0 trunk. 
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
 2010-02-24 17:04:48 -08:00
Mike Antipov 1acc52a7e7 Work on normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well) 
-- removed member pointer to Notification Well Icon from the LLBottomTray
 -- placed Well counter over the Icon, made center-aligned

--HG--
branch : product-engine
 2009-12-04 14:00:52 +02:00
Mike Antipov 653ebfbe7c Work on normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well) 
Refactored toggle interaction between Notification Well and Notification Well Window:
 -- set "Button.SetDockableFloaterToggle" init callback to Notification Well
 -- remove deprecated functionality in code
 -- update interaction with screen channels to work properly.

--HG--
branch : product-engine
 2009-12-04 12:48:08 +02:00
Mike Antipov 22303da8a6 Work on task EXT-3081 (Separate Message Well on Notifications Well and IM Well) 
Initial commit
 -- added two floater classes derived from LLSysWellWindow to work with Notification Well & IM Well
 -- register two floaters in place of previous sys_well (but with the same xml file)
 -- replace using of LLSysWellWindow with LLNotificationWellWindow in the out code (except of in LLScreenChannel::updateShowToastsState)
 -- rename member variable in bottom tray used for Notification Well

--HG--
branch : product-engine
 2009-12-03 13:48:07 +02:00
Yuri Chebotarev f2e4e9efa9 fix for low EXT-3090 "Select All" item should be disabled if there is no text in nearby chat's input field 
--HG--
branch : product-engine
 2009-12-03 16:10:21 +02:00
Yuri Chebotarev a2e23aa3d9 merge 
--HG--
branch : product-engine
 2009-12-02 19:38:54 +02:00
Yuri Chebotarev eae60da683 fix for EXT-2886 Context menu for Nearby chat text field should look like context menu for any text editor, should include such items as (cut,copy, paste etc) 
--HG--
branch : product-engine
 2009-12-02 19:37:33 +02:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates 
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
 2009-11-30 14:41:52 -08:00
James Cook f280c43d61 Use extern template for common singletons to reduce code bloat/link time. 2009-11-28 16:51:02 -08:00
richard b2a5a270af merge 2009-11-25 14:00:48 -08:00
richard 318ae1419d Backed out changeset: c94fdea670e5 2009-11-25 13:57:46 -08:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
richard 2c775c5429 commented out spam that was slowing side tray opening 2009-11-25 11:09:55 -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
Mike Antipov 0876df6eef No ticket. Code to resize bottom tray is refuctored after the latest fix for EXT-2616: 
- Removed unused param while extending bottom tray
 - Moved some debug messages

--HG--
branch : product-engine
 2009-11-20 14:55:30 +02:00
Mike Antipov 91fdbd92c8 Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when width of window is 800px) 
- updated resize behavior to shrink Snapshot button: only speaker is shown in this case.
- updated LLSpeakButton to hide/show its labels
- updated talk_button widget (talk_button.xml) to have correct follows attributes
- also fixed bug with calculating necessary updates for children while extending bottom tray

--HG--
branch : product-engine
 2009-11-20 14:39:27 +02:00
Eugene Mutavchi 5d446cdf52 Fixed low bug EXT-2501(Hidden Gesture button appears after viewer restart) 
--HG--
branch : product-engine
 2009-11-17 20:43:40 +02:00
Mike Antipov 812d18515d Completed major sub-task EXT-991 (Update bottom bar behavior on resize) 
- added possibility to shrink/extend buttons (gestures, move, view) while resizing
 - I had to add LLLayoutStack::getPanelMinSize interface to validate width of Layout panels with these buttons

--HG--
branch : product-engine
 2009-11-17 13:03:08 +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
Mike Antipov 8a0341f42e Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Fixed issue: "Snapshort button can appear first due to its the least width while Bottom Bar extending"
	- implemented ordering in which buttons can be shown: Gesture, Move, View, Snapshot.

--HG--
branch : product-engine
 2009-11-13 18:58:23 +02:00
Mike Antipov 806edae084 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Improved functionality to process Buttons showing via context menu
 - added new alert dialog ("BottomTrayButtonCanNotBeShown") in case when there is no enough space to show button

For now it contains a such message:
"Selected button can not be shown right now.
The button will be shown when there is enough space for it."

It should be reviewed by XUI team

--HG--
branch : product-engine
 2009-11-13 17:52:57 +02:00
Mike Antipov 977b731dd6 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Implemented functionality to process Buttons hidden/shown via context menu
1. hidden buttons are not processed while resizing
2. setTrayButtonVisibleIfPossible() is implemented:
	 * If it is impossible to show required button via context menu due to there is no enough room in bottom tray
	 * it will no be shown.
	 * Method also stores resize state to be processed while future bottom tray extending:
	 *  - if hidden while resizing button should be hidden it will not be shown while extending;
	 *  - if hidden via context menu button should be shown but there is no enough room for now
	 *    it will be shown while extending.

--HG--
branch : product-engine
 2009-11-13 17:28:19 +02:00
Yuri Chebotarev bff45e735f merge 
--HG--
branch : product-engine
 2009-11-13 16:30:39 +02:00
Mike Antipov fc9741f9ae Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Implemented functionality to process shrink after bottom tray min width is reached

--HG--
branch : product-engine
 2009-11-13 14:32:23 +02:00
Steve Bennetts 92cacc5581 Merge with product-engine 2009-11-12 16:47:15 -08:00
James Cook d6136a40b1 merge 2009-11-12 08:29:38 -08:00
Mike Antipov fcb99c3040 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refuctored:
 - moved code to process Borrom Bar shrinking into separate method
 - unified code to process a hiding of the Bottom Tray's buttons

Code is ready to process shrink after min width is reached & be synchronized with user hidden buttons

--HG--
branch : product-engine
 2009-11-12 17:43:23 +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
Mike Antipov 454c02102c Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refactored:
  - moved code to process width increasing into separate method

--HG--
branch : product-engine
 2009-11-11 16:42:18 +02:00
Mike Antipov 3862e97219 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refactored:
  - processShowButton() now gets type of buttons should be shown instead of object
  - removed unnecessary code

--HG--
branch : product-engine
 2009-11-11 16:17:29 +02:00
Mike Antipov 9ab02a68bb Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refactored:
  - move calculating of buttons_required_width inside processShowButton();
  - remove changing of delta_width out of processing each button while increasing width

--HG--
branch : product-engine
 2009-11-11 13:53:04 +02:00
Mike Antipov cff807dfaf Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
- refactored logic increasing of width
 - fixed bug with incorrect work in some cases

--HG--
branch : product-engine
 2009-11-11 13:13:34 +02:00
James Cook fb20a7281d EXT-2338 Move button tooltips to strings the viewer translation tool can parse. 
Also moved mSpeakBtn from llnearbychatbar to llbottomtray, because the bottom
tray is its parent.
 2009-11-10 17:12:07 -08:00
Mike Antipov eb05116e2b Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
- update min width for chiclet panel
  - move showing of hidden buttons to place where resize strategy is determined

--HG--
branch : product-engine
 2009-11-10 18:07:19 +02:00
Mike Antipov 729df1aa33 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Initial refactoring of functionality:
  - cleaning
  - Imroved logic while resizing of bottom tray

--HG--
branch : product-engine
 2009-11-10 16:13:20 +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
richard 3b2d9f63e3 merge 2009-11-09 16:14:52 -08:00
Tofu Linden e9048b1779 Central-source the authoritative state of mic openness. 2009-11-09 17:13:37 +00:00
richard fac0b6836a refactored top level ui into main_view.xml 2009-11-05 20:36:15 -08:00
Tofu Linden 179f18d1ab LLTalkButton -> LLSpeakButton, 'cos that's what it is. 2009-11-04 20:34:11 +00: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 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 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 81e0fb43ca merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3 
* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262
* New Dev: EXT-1292 EXT-1139
 2009-10-09 00:42:36 +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
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
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
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
 2009-08-24 20:04:52 +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 db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
 2009-08-03 22:25:48 +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
Roxanne Skelly ff52ac089f DEV-34822 viewer 1.23 merge 
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
 2009-07-15 21:50:42 +00:00
Jiao Li b90099b4b0 1. created prototype stand up button ins LLBottomTray 
2. re-arranged LLFloaterReg::add alphabetically

to be reviewed
 2009-07-09 07:00:30 +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 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
Steven Bennetts 33dbf11076 Fixed a shutdown crash. 2009-06-21 17:51:35 +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