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

263 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 64c1146213 add Cancel button to outgoing call dialog, make it work (perhaps), make the name of the departing voice session more accurate (perhaps). WIP. 2009-11-12 15:35:08 +00:00
Tofu Linden c2b227c939 more inching towards outgoing call popup goodness... 2009-11-12 14:28:57 +00:00
Tofu Linden 7cf3008da7 more work on the outgoing call popup... 2009-11-12 14:15:19 +00:00
Tofu Linden 095a3d4372 more mimicking of the good parts of the incoming_floater! 2009-11-12 13:33:54 +00: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
Tofu Linden 3888fed3f6 merge. 2009-11-12 11:57:28 +00:00
Lynx Linden b38388d131 Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/ 2009-11-12 09:54:07 +00:00
Lynx Linden 96286cde37 DEV-41324: Updated the Incoming Call floater. 
This is now a dockable floater with a dock tongue. It currently floats
over the sys well, where other system messages appear. The appearance
now matches the voice spec more closely. It also tells you which voice
channel you would be leaving if you accept the call.
 2009-11-12 09:53:34 +00: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
Tofu Linden cc864d86ce outgoing call dialog. doesn't do anything and is ugly/wrong, but it exists. WIP. 2009-11-11 18:06:44 +00:00
Igor Borovkov 14c668bb97 fixed reopened subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from "Second Life", zero uuid) 
now not counting messages with from = "Second Life" and from_id = receiver's uuid

--HG--
branch : product-engine
 2009-11-11 19:19:07 +02:00
Tofu Linden 0d01300762 sketch-out the outgoing call dialog code. WIP. 2009-11-11 16:59:49 +00:00
Vadim Savchuk 6146cfc5c1 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 17:47:20 +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
Lynx Linden d5f3e6b2a8 Automated merge with file:///home/lynx/hg/general/viewer-2-0 2009-11-11 10:59:31 +00:00
Lynx Linden 162924aadf DEV-41317 DEV-42311: Added ad-hoc voice call support. 
You can now multiple select users in the People panel, hit Call, and
start an ad-hoc voice conference call with those users.

The most difficult part here was automatically starting the call once
the conference chat panel popped up. We have to wait for the panel to
initialize before we can start a call, so I added another callback to
LLIMModel to enable us to get notified when the panel has initialized.
This is all wrapped up behind a new LLAvatarActions::startAdhocCall()
API.
 2009-11-10 18:53:07 +00:00
Vadim Savchuk c3d9aa60a7 Merge from default branch 
--HG--
branch : product-engine
 2009-11-10 16:05:53 +02:00
Ramzi Linden cf7fdf86bf Develop>XUI>Send Test IMs: Lets not poke fun of a resident tradition in the public beta. Also it should test a sentence that wraps. Ideally it would also test a string with double-byte characters but I dont know how to do that. 2009-11-10 11:50:01 +08:00
Sergei Litovchuk 31cc68ecd3 Fixed normal bug EXT-2327 "Incoming call dialog crashes after logout". 
- Added NULL pointer checks.

--HG--
branch : product-engine
 2009-11-09 22:04:23 +02:00
Alexei Arabadji 8f679595d5 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 
--HG--
branch : product-engine
 2009-11-06 19:31:45 +02:00
Alexei Arabadji 8a4e36a9bd fixed EXT-2295 "'Group Chat' btn makes chicklet appear only" 
--HG--
branch : product-engine
 2009-11-06 19:31:27 +02: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
Igor Borovkov ddb42652e3 IM: minor refac., moved floater registation of llviewerfloaterreg 
--HG--
branch : product-engine
 2009-11-06 15:49:56 +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
Alexei Arabadji 49db6cd157 partly impemented EXT-700 '"Offer" notifications should be accessible via chiclet' 
--HG--
branch : product-engine
 2009-11-05 17:43:06 +02:00
Igor Borovkov 265805a1b0 fixed low bug EXT-1941 'User is offline' message appears every time you performe double mouse click on avatar's while IM has been already started 
--HG--
branch : product-engine
 2009-11-02 17:33:42 +02:00
Igor Borovkov d3d53c9e41 IM: cleaned u TODO marks and completed minor TODOs. 
--HG--
branch : product-engine
 2009-11-02 16:59:43 +02:00
Eugene Mutavchi 788b08f525 Fixed normal bug EXT-1877([BSI] Offline status not showing in IMs) 
--HG--
branch : product-engine
 2009-11-02 15:51:43 +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
Igor Borovkov 3a87aa6164 converted workaround to a fix for normal bug EXT-1918 (Region Messages crash the sender and anyone set busy). 
--HG--
branch : product-engine
 2009-10-29 16:33:10 +02:00
Dmitry Zaporozhan e9c83f2343 Merge 
--HG--
branch : product-engine
 2009-10-28 20:16:13 +02:00
Dmitry Zaporozhan e8e5dfeb36 Fixed critical bug EXT-1918 - [BSI] Region Messages crash the sender and anyone set busy. 
NOTE - this is temporary workaround to fix the crash.

--HG--
branch : product-engine
 2009-10-28 20:12:48 +02:00
Eugene Mutavchi 4ca9e28f91 No ticket, just renamed mProfileButtonEnabled to mOtherParticipantIsAvatar 
--HG--
branch : product-engine
 2009-10-28 18:44:31 +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 8a5d4c91f5 merge 
--HG--
branch : product-engine
 2009-10-27 18:04:17 +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
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
Igor Borovkov e874fbc8f0 IM: got rid of old im floater dependency in LLIMMgr::addMessage(...) 
--HG--
branch : product-engine
 2009-10-26 18:05:00 +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
Igor Borovkov d81b888410 IM: fixed remove session logic, got rid of "being session removed" field 
--HG--
branch : product-engine
 2009-10-26 16:41:47 +02:00
Igor Borovkov e018754f7e IM: removed unused & empty methods and classes, added TODO marks 
--HG--
branch : product-engine
 2009-10-26 13:05:08 +02:00
Igor Borovkov b544e125a4 IM minor refactoring: removed unused LLIMMgr::isIMSessionOpen(...) - duplicate of LLIMMgr::hasSession(...) 
--HG--
branch : product-engine
 2009-10-26 08:16:20 +02:00
Steve Bennetts 80b682d4b4 merge 2009-10-23 12:17:30 -07: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
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07: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 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
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07: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
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07: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
Steven Bennetts f74e3d40fd Added safety checks wherever getSpeakerManager() is called. 
Removed a meaningless (and misleading) const qualifier to a LLPointer return value.
Added a getter for LLSpeakerMgr::mVoiceChannel to replace some very incorrect code casting LLIMSpeakerMgr to LLVoiceChannelP2P
Reviewed by Leyla
 2009-10-09 00:57:36 +00:00
Steven Bennetts fad53523ae * EXT-1357 - Client gets stuck when invited to a voice call. Incorrect .xml file specified. 
(merged from viewer-2.0-qa-4)
 2009-10-08 03:41:35 +00:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07: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
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04: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
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 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
brad kittenbrink bae94e4340 Merged login-api with viewer-2.0.0-3 up through r132290. 2009-09-01 12:21:51 -04:00
Steven Bennetts 51500f82e2 svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3 
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
 2009-08-28 22:30:09 +00:00
Steven Bennetts 9e2cb2f4a0 DEV-38942 Eliminate startModal() from LLModalDialog 
Also moved TOS and Critical floaters to login debug menu for testing
 2009-08-28 08:04:26 +00:00
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929). 
Some minor post-merge cleanups still required.
 2009-08-27 16:25:02 -04: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
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 1db494f58a * Added a few safety checks to LLScrollContainer 
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed
* Changed default action for avatar list to be IM as per spec
* Fixed merge of home tab from avatar code.
 2009-08-14 01:15:46 +00:00
brad kittenbrink 39c2a584f4 Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api. 2009-08-13 01:28:38 -04:00
Steven Bennetts caa367e5d4 svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3 
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261  I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897  Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
 2009-08-11 06:37:35 +00:00
brad kittenbrink 33cc363a68 Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup. 2009-08-04 15:34:34 -07: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
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07: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 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
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
Bryan O'Sullivan baa73fddd9 Merge with viewer-2.0.0-3 branch 2009-06-22 15:02:19 -07: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
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module. 
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.

reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
 2009-05-22 23:27:16 +00:00
Steven Bennetts a4000c3744 merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 2009-05-08 07:43:08 +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 d725e5b240 QAR-872 Viewer 1.21 RC 3 
merge viewer_1-21 96116-97380 -> release
 2008-09-29 19:14:50 +00:00
Steven Bennetts 0c0391cc71 QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
 2008-07-22 19:01:52 +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 b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
 2008-04-03 19:21:14 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Brian McGroarty 25de7377c1 QAR-377 maintenance-6 merge: 
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
 2008-03-19 00:01:42 +00:00
Steven Bennetts 377ae59c21 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release 
DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110  	 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files.  This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115  truncated word in the Advanced Water Editor's modal help dialog
 2008-03-11 01:47:36 +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 ed517c3b14 svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned -> release 2008-01-24 21:11:28 +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
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +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
Christian Goetze 5ec8bbbe22 svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 2007-10-10 00:01:43 +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
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
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
 2007-07-20 20:38:05 +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
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
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
Josh Bell fbf49910f3 svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance 2007-01-08 21:43:30 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00