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

56 Commits (353329c2c2e9e8fa1ff273de2016c9e155585f45)

Author SHA1 Message Date
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine 16f0cfe6dc MAINT-5670 FIXED <icon> should not be parsed in expandable textboxes 2015-09-30 13:31:08 +03:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
brad kittenbrink 7db4d2b88f Fix for CHOP-220. Reviewed by mani. 2010-11-22 19:07:17 -08:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile 
streamlined LLUICtrlFactory's interface
 2010-08-20 10:14:28 -07:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory... 
removed redundant functionality
moved buildPanel to LLPanel
 2010-08-16 15:00:51 -07:00
Tofu Linden 77330d5c31 (hairy) merge from viewer-release 2010-08-10 14:04:35 +01:00
gabriel lee c70b05082f patching from fixes made in dessie/viewer-release 2010-08-09 12:44:28 +01:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Dmitry Zaporozhan 220c0e9479 Fixed normal task EXT-6025 - [HARD CODED] Side Bar : "Save Pick" - "Pick" is in EN (Save [WHAT]) 
Removed unused hardcoded strings, replaced "Save [WHAT]" with simple "Save Pick" as it's the only label needed for this button.
Reviewer by Kent Quirk https://codereview.productengine.com/secondlife/r/28/

--HG--
branch : product-engine
 2010-03-16 17:36:44 +02:00
Dmitry Zaporozhan a58551c050 Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit Pick - "(will update after save)" 
Replaced hardcoded string with xml string.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/8/

--HG--
branch : product-engine
 2010-03-15 10:32:51 +02:00
Vadim Savchuk 8758fac712 Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save Pick" button to be active) 
* Changed the Save button to react on texture picker commit, not on selection.
* Added an optional "no_commit_on_selection" parameter to LLTextureCtrl
  to commit only when user presses the OK button in the picker or changes
  the texture via DnD, i.e. browsing in the picker doesn't commit.

--HG--
branch : product-engine
 2010-01-20 19:49:41 +02:00
Sergei Litovchuk 6649dcc38e Fixed normal bug (EXT-3794) Controls in Edit Pick side panel cut off by 
vertical scrollbar.
- Added resizing pick info and pick editing panels when vertical scrollbar appears.
- Resized controls on pick info and edit panels to avoid them being overlapped by scrollbar.
- Changed pick info description from text box to text editor in read-only mode to allow text scrolling.
- Removed text box resizing logic from LLPanelPickEdit.

--HG--
branch : product-engine
 2010-01-14 18:52:52 +02:00
Dmitry Zaporozhan 0c3f6abca6 Fixed low bug EXT-1326 - Pick info should contain vertical scroll-bar if height of viewer window less than Pick Info's height. 
--HG--
branch : product-engine
 2009-12-24 16:10:53 +02:00
Sergei Litovchuk 0847789222 Fixed normal bug EXT-3409 "Places panel: pick for remote location created with current agent's coordinates". 
- Fixed storing global position for remote location pick.
- Fixed setting current location to the pick.
- Fixed pick location text. Added resolving remote parcel name from ID.
- Cleaned up unused code in llpanelpick.

--HG--
branch : product-engine
 2009-12-15 18:36:53 +02:00
Andrew Dyukov 52ce4b9229 Fixed normal bug EXT-1625 (Me > Pick Info > Edit Pick does not enable "Save" button when 
image, location is changed). Implemented workaround:enabling save button each time when picker
is opened, even if texture wasn't changed (see Steve's comment).

--HG--
branch : product-engine
 2009-12-02 14:44:39 +02:00
Dmitry Zaporozhan 1b0732183e Merge 
--HG--
branch : product-engine
 2009-11-09 15:59:29 +02:00
Dmitry Zaporozhan f2f5779748 Fixed low bug EXT-2319 - Unable to save new Pick. 
--HG--
branch : product-engine
 2009-11-09 13:55:55 +02:00
Andrew Dyukov b6aef7ea39 Fixed EXT-1769 (Edit Pick: '+' icon blinks on mouse over), but new icon is needed. 
--HG--
branch : product-engine
 2009-11-05 19:20:56 +02:00
Vadim Savchuk 5a2424d010 Fixed minor bug EXT-1769 (Edit Pick: '+' icon blinks on mouse over) 
--HG--
branch : product-engine
 2009-11-04 21:45:16 +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 ea1bfae838 Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
 2009-10-19 02:17:01 +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
Steven Bennetts 44f294d484 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3 
* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822
 2009-09-10 03:08:54 +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 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
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
Mark Palange 0274c1f2b1 Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. 
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
 2009-07-16 17:54:58 +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
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 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
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
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +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
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
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