| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  | Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh. | 
|  | * Show creator, owner and group information when only selecting a single prim
  in a linkset.
reviewed with Simon | 
|  |  | 
|  |  | 
|  | multiple objects selected. | 
|  |  | 
|  |  | 
|  | when a static pathfinding object is in not in the current region. | 
|  | mode.  Displaying a modal notification if user attempts. | 
|  | /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution | 
|  |  | 
|  | back-out the back-out for this branch.  yay. | 
|  | Backing out this merge that I pushed (prematurely) to the wrong place. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | --HG--
branch : product-engine | 
|  |  | 
|  | EXT-4547	[BSI] it is possible to highlight multiple layers of chat
EXT-3844 	Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 	Add an option to restrict entering non-ascii symbols in text editor.
reviewed by Leyla | 
|  | Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly | 
|  | llpanelpermissions.
No functionality changes.
--HG--
branch : avatar-pipeline | 
|  | Cuts number of includes of llnotifications.h from 300+ to 40. | 
|  | Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater. | 
|  |  | 
|  | Also fixes EXT-172, EXT-2399.  Semantics now are:
Object name, object desc, parcel name, region name, inventory item name
all are ASCII only.
Parcel desc allows arbitrary Unicode chars.
Group names force ASCII only.
Reviewed with Leyla | 
|  | Reviewed with Richard. | 
|  | 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/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. | 
|  | https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 | 
|  | svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8 | 
|  | 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 | 
|  | ignore-dead-branch | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 .  QAR-1149 -- Final merge of notifications to trunk. | 
|  | svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4 | 
|  | svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448 | 
|  | dataserver-is-deprecated | 
|  | Note: trivial change. | 
|  | svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated | 
|  | Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated | 
|  | QAR-424 | 
|  | 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release |