Commit Graph

162 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Richard Linden d56be1f175 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
Richard Linden e854db0645 EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Richard Linden 22a6170a7b EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-27 19:55:16 -08:00
Richard Linden bbc265a9d5 EXP-1846 FIX Text positioning issues in Floaters, Notifications, UI, and toasts with UI size smaller than 1
also, re-enabled floater_test_textbox.xml
2012-01-26 16:30:38 -08:00
Richard Linden 3a597af700 EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
fixed font metrics rounding error and made corrective adjustments in layout
2012-01-18 16:30:53 -08:00
Alissa Sabre a94a923240 storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Alissa Sabre 6df5dfc0da storm-1723: fix character display when a lot of different characters are used 2011-12-15 15:19:50 -05:00
Boroondas Gupte 5774bac296 merged VWR-25588 fix (hovertext occlusion) 2011-07-21 11:02:30 +02:00
Boroondas Gupte 1a1a4beb52 FIRE-543/VWR-25588: made in-code comment a bit clearer 2011-07-21 10:54:22 +02:00
Boroondas Gupte 912e99906b Credit Zi: FIRE-543 change fixes SH-489 and VWR-24017 and therefore also VWR-25588
It looks like the parent changeset (86eec7b46566; transplanted from
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/7af0278beaef)
fixes the following issues:
* SH-489 (object hover text not occluded)
* VWR-24017 (nametag / bubblechat not occluded)
* VWR-25588 (union of the above two symptopms)

Thus list them all under Zi's entry in doc/contributions.txt.

Also removed her name from the in-code comment, to adhere to our CS.
2011-07-21 10:49:19 +02:00
ziree 535f718736 Proposed fix for FIRE-543 - Hovertext renders as overlay on top of everything else
(transplanted from 7af0278beaefa4fb1eb9a41f4e9317ac5fe37690)
2011-07-17 17:26:40 +02:00
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -07:00
Richard Linden a8405dea54 EXP-829 FIX Text Box Alignment bug
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable

fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms


reviewed by Callum
2011-05-25 18:10:58 -07:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn 8d9fba43b9 Firestorm merge catchup 2011-08-27 06:00:46 -04:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Kadah_Coba b8cdfea2f0 Added basic font size adjustment pref (needs better desc and additional work in prefs) 2011-08-21 18:00:44 -07:00
Kadah_Coba d26472736f Added basic support for changing font schemes 2011-08-20 19:20:42 -07:00
ziree 1a3f6fce8b Proposed fix for FIRE-543 - Hovertext renders as overlay on top of everything else 2011-07-17 17:26:40 +02:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Linden 093e83386d merge 2010-08-26 12:49:00 -07:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Richard Linden 45b6098477 EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk) 2010-08-19 17:35:08 -07:00
Richard Linden 4075efaf0d EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk) 2010-08-19 17:35:08 -07: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 932f248553 optimized font lookups 2010-08-04 19:01:28 -07:00
Richard Nelson d72a21aca1 further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Richard Nelson b95ad3b5ce further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Richard Linden c9ea67aab0 merge 2010-07-29 12:05:48 -07:00
Richard Linden 5b609171ff merge 2010-07-29 12:05:48 -07:00
Richard Linden 6a3538a693 fix for truncated text rendering 2010-07-29 11:53:31 -07:00
Richard Linden 4431d60370 fix for truncated text rendering 2010-07-29 11:53:31 -07:00
Tofu Linden 9206341e68 fix an implicit downcast in font code. 2010-07-28 11:45:01 +01:00
Tofu Linden e0b6191113 fix an implicit downcast in font code. 2010-07-28 11:45:01 +01:00
Richard Linden 50d8cc6d37 first pass ui rendering performance improvements 2010-07-23 22:07:15 -07:00
Richard Linden 6cc6f81678 first pass ui rendering performance improvements 2010-07-23 22:07:15 -07:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Richard Linden ee7fce63fe missed some cases in font valign switch 2010-07-01 21:29:25 -07:00
Richard Linden 187a4b638d EXT-7654 - About Land Floater> Icons missing
fixed layout of embedded icons in text labels
2010-07-01 19:48:39 -07:00
Tofu Linden 6f77f8891a viewer2 merge 2010-03-24 10:31:19 +00:00
Richard Nelson 91b90b0a17 EXT-5549 Can't select last character in chat window 2010-03-23 11:18:01 -07:00
Tofu Linden afd30a8bb0 fix warning introduced from trunk merge. 2010-02-19 13:56:44 +00:00
Tofu Linden 49b37a4dc3 merge from viewer2, conflicts resolved... 2010-02-19 13:51:35 +00:00
Monroe Linden 08e3e05c0a Additional optimizations to text reflow for EXT-5071.
Added versions of LLFontFreeType::getXAdvance() and LLFontFreeType::getXKerning() that take LLFontGlyphInfo* instead of llwchar.  This allows code in LLFontGL that already has the LLFontGlyphInfo* to pass them instead, saving calls to LLFontFreetype::getGlyphInfo.

Reviewed by Richard.
2010-02-18 13:40:32 -08:00
Tofu Linden 4f4afcf489 merge backout. 2010-02-13 12:50:06 +00:00
Tofu Linden f5572abb5e Backed out changeset 6c161782dba3 2010-02-13 12:49:54 +00:00
Palmer Truelson 660c3b182c merge 2010-02-12 21:05:09 -08:00
Palmer Truelson 651b14fcae Backed out davep's UI optimization. changeset 3134cb7bb181 2010-02-12 21:04:51 -08:00
Palmer Truelson 54a95f706f merge 2010-02-23 17:19:58 -08:00
Palmer Truelson 7885748497 Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3 2010-02-23 17:08:06 -08:00
Dave Parks ff0271d632 merge 2010-02-04 23:43:13 -06:00
Dave Parks 979ddb2ec9 No more matrix ops in UI code. 2010-02-04 23:41:54 -06:00
richard 1bc67a9d72 EXT-4625 - Chat bar doesn't display trailing character on some strings
reviewed by Leyla
2010-02-04 10:25:31 -08:00
richard 4966073030 moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf

reviewed by Brad
2010-01-06 12:23:56 -08:00
richard 1bbd259f2d EXT-3878 - Menus disappear when UI Size is < 1.00
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word

reviewed by James
2010-01-06 11:17:38 -08:00
Tofu Linden 183c991402 DEV-44614 ugly/broken font and formatting used for IM toast emotes
fix bug, also fix some comments/typos/enumparams in this code area.
2009-12-23 11:29:13 -08:00
richard 9ff869a6b2 Backed out changeset: 4d482c1ed041 2009-12-17 10:01:55 -08:00
James Cook e8fe81c4fc Backed out changeset: cfa60aef8061, added setBlockFromValue so setting a LLRect param in code will set the individua 2009-12-16 16:04:09 -08:00
richard 3a02b9ec88 added setBlockFromValue so setting a LLRect param in code will set the individual left, right, top, bottom values, for example
don't call setupParams when creating widgets from code
moved Multiple param constraints into BaseBlock to remove extra scoping
2009-12-15 19:33:18 -08:00
richard b8fdf82510 fix for ellipses not appearing in single line text widgets
fix for ellipses sometimes appearing at end of wrapped line of text

reviewed by James
2009-12-11 13:50:40 -08:00
richard 6408298aad EXT-3112 - Bad font width information with SansSerif causing clipping of trailing "r"?
better handling of ui scale != 1

reviewed by Mani
2009-12-09 17:41:42 -08:00
richard 1d2a8e0f83 ext-3112 - bad font width information with sansserif 2009-12-07 13:00:40 -08:00
angela 0098bf40ea undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating 2009-11-17 16:33:49 +08:00
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
Steve Bennetts 590d3b9e3a EXT-1279 Crash if font file not found.
Added getFontDefault() to llfontgl.h

--HG--
branch : branch-test
2009-10-15 14:14:46 -07:00
Richard Nelson fd312d1929 improved metrics for llfontgl::getWidth (use greater of character width/xadvance)
llfontgl::Addchar now called consistently when requesting font metrics
no longer possible to have font glyph info without rendered font

EXT-1294 - LLExpandableTextBox: wrong ellipses

reviewed by James and Mani
2009-10-14 20:16:18 +00:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
Richard Nelson 606311b508 text boxes are now *not* mouse_opaque by default
fixed some textbox and text editor layout problems (getWidth called with wrong index)
EXT-1302 - rewrite LLExpandableTextBox to use new LLTextBase functionality (using custom LLExpanderSegment)

reviewed by James
2009-10-05 20:53:51 +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
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
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
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +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
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
Christian Goetze 1aa0416aef 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.
2009-03-13 21:28:40 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Adam Moss 6861459c48 QAR-1202 Mergeme for Viewer font in Russian, Ukrainian (for business
reasons):

svn merge -r109512:109516
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-l10n/maint-l10n-3


DEV-22792 Russian and Ukrainian Viewer strings submission

DEV-24945 Chat console with scaled UI shows vertically misaligned
characters

DEV-25459 Viewer text-snapping is broken in a few ways

DEV-23475 Change the win32 viewer's font prioritization order to be more
Cyrillic-friendly

QAR-1042 Viewer in Russian, Ukrainian: need to verify that
French/German/Japanese/Korean were not effected by import of Russ and
Ukr.
2009-02-06 17:16:06 +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
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +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 ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Eric Tulla e77de5d685 Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Josh Bell 5c51ae5a7b svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
QAR-500 maint-viewer-5 merge
2008-04-24 18:38:17 +00:00
Adam Moss 669d1162f4 QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
2008-04-17 14:56:00 +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 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
2008-03-25 22:50:26 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +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 70aaa3e444 svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-04 21:57:06 +00:00