| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
time-based media
 | 
 | 
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
 | 
 | 
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.
 | 
 | 
Self reviewed.
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
 | 
 | 
implemented context menus as spawning on right-mouse-up, which interacts poorly with LLToolPie and recycled pie menu code.  Changed context menu spawn to right-mouse-down, which allows click-drag-select behavior like the Mac.  Eliminated unnecessary LLContextMenu::handleMouseUp and handleMouseDown methods -- these are handled in the LLMenuGL base class.  Added handleRightMouseUp to LLMenuHolderGL to hide menus on right-mouse-up outside the menu.  Reviewed with Richard.
 | 
 | 
ignore-dead-branch
 | 
 | 
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
 | 
 | 
merge viewer_1-21 96116-97380 -> release
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
 | 
 | 
release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
 | 
 | 
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
 | 
 | 
QAR-424
 | 
 | 
79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
 | 
 | 
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
 | 
 | 
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
 | 
 | 
 | 
 | 
 | 
 | 
 |