- Oct 23, 2009
-
-
Leyla Farazha authored
EXT-1742 Navbar should have a dropshadow that covers the sidepanel EXT-1563 I18N: Alt-arrow instructions in tab tooltips wont honor their translation reviewed by james
-
- Oct 13, 2009
-
-
Leyla Farazha authored
EXT-1479 I18N: string in /en/widgets/location_input.xml wont honor its translation and made tabs height customizable reviewed by Richard
-
- Oct 03, 2009
-
-
James Cook authored
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
-
- Sep 22, 2009
-
-
David Parks authored
Self reviewed.
-
- Sep 11, 2009
-
-
https://svn.aws.productengine.com/secondlife/pe/stable-2@1648Steven Bennetts authored
Fixes: EXT-843 EXT-846 New Dev: EXT-514
-
Steven Bennetts authored
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.
-
- Sep 08, 2009
-
- Aug 28, 2009
-
-
Steven Bennetts authored
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
-
- Aug 24, 2009
-
-
Richard Nelson authored
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)
-
- Jul 27, 2009
-
-
James Cook authored
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
-
- Jul 06, 2009
-
-
James Cook authored
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
-
- Jun 21, 2009
-
-
Steven Bennetts authored
ignore-dead-branch
-
- May 08, 2009
-
-
Steven Bennetts authored
-
- Mar 13, 2009
-
-
Christian Goetze authored
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
-
- Mar 04, 2009
-
-
Eric Tulla authored
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
-
- Jan 07, 2009
-
-
Aaron Brashears authored
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
-
- Aug 12, 2008
-
-
Steven Bennetts authored
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
-
- Jun 25, 2008
-
-
Steven Bennetts authored
dataserver-is-deprecated
-
- Jun 06, 2008
-
-
Steven Bennetts authored
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
-
- Jun 02, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-mergeBryan O'Sullivan authored
dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
-
- May 06, 2008
-
-
Steven Bennetts authored
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
-
- Apr 01, 2008
-
-
Steven Bennetts authored
QAR-424
-
- Mar 10, 2008
-
-
Steven Bennetts authored
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
-
- Feb 27, 2008
-
-
Brad Kittenbrink authored
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
-
- Feb 19, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13Steven Bennetts authored
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
-
- Dec 18, 2007
-
-
Jon Wolk authored
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
-
- Oct 04, 2007
-
-
Aaron Brashears authored
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.
-
- Aug 01, 2007
-
-
Monroe Williams authored
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
-
- Jun 21, 2007
-
-
Kelly Washington authored
-
- Jun 13, 2007
-
-
Aaron Brashears authored
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
-
- May 02, 2007
-
- Apr 11, 2007
-
- Mar 30, 2007
-
- Jan 03, 2007
-
-
svn+ssh://svn.lindenlab.com/svn/linden/release@56429Josh Bell authored
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
-
Aaron Brashears authored
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
-
- Jan 02, 2007
-
-
James Cook authored
-