| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | ... so the last occurance of the build prefix in the executable path
will be matched. This should avoid cuttung too much subdirs away if
someone checks out the source to a path already containing
"/build-darwin-" or "/build-linux-". | 
|  | checkout on Linux.
The bug seems to be caused by recent switch to Autobuild, which affected the build directory path. | 
|  | --HG--
branch : storm-102 | 
|  | --HG--
branch : storm-102 | 
|  | also fixes:
SNOW-522 FIXED crash due to looking for skins/paths.xml at the wrong path
originally commited at http://svn.secondlife.com/trac/linden/changeset/3550
SVN changeset did not apply automatically due to changed context.
Manually applied changes, which was straight forward.
Added SNOW-522 in doc/contributions.txt, because that's fixed by this, too.
(transplanted from 8afc8382dd9bddd4968060d306d96218d571a171) | 
|  |  | 
|  | (which it isn't until after login)
To be reviewed by Soft! | 
|  | it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer. | 
|  |  | 
|  | supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
 -Nyx | 
|  | 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. | 
|  | 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. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04
Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac.
Reviewed by James. | 
|  | ignore-dead-branch | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456 | 
|  | dataserver-is-deprecated | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  | release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. | 
|  | svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | 
|  | svn+ssh://svn/svn/linden/branches/more-random into release. | 
|  | useful. no code changes. SL-13762 | 
|  |  |