6c1f89ea6e
added settings to toggle grab and alt-zoom ability
2010-09-28 17:13:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
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
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
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
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
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
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
73bc0fb42b
merge -r 56779:58057 /branches/selection_management
2007-02-17 03:02:16 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Richard Linden