summaryrefslogtreecommitdiff
path: root/indra/newview/res
AgeCommit message (Collapse)Author
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-31mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-14Changed viewer channel to "Second Life Development"Aimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12Pulled "dessie/viewer-release" into "dessie/viewer-public".Christian Goetze (CG)
2010-08-12Pulled "dessie/viewer-release" into "dessie/viewer-public".Christian Goetze (CG)
2010-08-12Pulled "viewer-hotfix" into "viewer-release".Christian Goetze (CG)
2010-08-11Updated viewer patch number & channelDessie Linden
2010-08-11Updated viewer patch number & channelDessie Linden
2010-06-29VWR-8885 CMAKE build hard depends on artwork filesTofu Linden
Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly. Reviewed by Aimee.
2010-06-29VWR-8885 CMAKE build hard depends on artwork filesTofu Linden
Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly. Reviewed by Aimee.
2010-06-13mergeTofu Linden
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-11Changed version to 2.1.0.0Dessie Linden
2010-04-30Bumped version to 2.0.2.0 - just in caseDessie Linden
2010-04-15merge from viewer-hotfixTofu Linden
2010-04-14fixed eol styleRichard Nelson
2010-04-14fixed eol and lack of copyright in resource.hRichard Nelson
2010-04-14EXT-2418 and EXT-6317Richard Nelson
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
2010-04-14merge from viewer-hotfixTofu Linden
2010-04-13fix for EXT-6317 and EXT-2418 regressions in installed viewersRichard Linden
new 32-bit mouse cursors were not getting packaged by installer for windows builds reviewed by Monroe
2010-03-31Include channel names in update_version_files.py invocation to fix bad ↵CG Linden
viewer channel name.
2010-03-17linux parts for EXT-4819 [NUX] New Application Icon IntegrationTofu Linden
2010-03-09improved mouse cursors (32-bit)Richard Linden
2010-03-09changed line endings to UnixRichard Linden
2010-03-09EXT-2418 - improved cursors for sit/open/buyRichard Linden
2010-03-05changed line endings to UnixRichard Linden
2010-03-05EXT-2418 added open/sit/buy mouse cursorsRichard Linden
2010-03-04partial fix for EXT-4819 [NUX] New Application Icon IntegrationIgor Borovkov
only the obvious icon files are replaced --HG-- branch : product-engine
2009-11-06Adding new option definition - forgot.CG Linden
2009-10-15Merge up to latest viewer/viewer-2-0Nat Goodspeed
2009-10-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-07Merged in latest svn-imports-viewer-20 changes.brad kittenbrink
2009-10-07Removing tool icons from viewerRes.rcSteven Bennetts
2009-10-07EXT-1141 Remove one-click cursor icons from art directories. Cursor is now ↵James Cook
a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly.
2009-09-16Relocate build.sh to the top of the source tree.CG Linden
2009-09-13Adapt the build script so it can be invoked from a developer checkout.CG Linden
2009-09-08MergeBryan O'Sullivan
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-31Port over the new build scripts from para-test, tweek update_version_files ↵CG Linden
to use the repo revision number for now.
2009-07-30Bump trunk version to 1.31Christian Goetze
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> ↵Steven Bennetts
viewer-2-0 Also: * Moved media remote shortcut to Communicate menu * Changed mini map menu to toggle instead of show
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-04-09svn merge -r115000:116937 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk.
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08svn merge -r104838:107352 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 NOTE : also ran scripts/update_version_files.py --verbose --server --server_channel="Second Life Server" to update server version information before doing a compile test. Committed with the results of this version file update. Conflicts resolved by prospero: scripts/maintenance/update-groups.py : kept the trunk version (was merged from Rad Chillies) scripts/make_deploy_group.py : merge by hand (I'm the one to do this, anyway) indra/llcommon/llversionserver.h : kept trunk version indra/newsim/llgettaskstats.cpp : kept trunk version. (svn revert)This was imported late into 1.25, after the branch merged into trunk, and no changes were made in the 1.25 branch after the import. indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more complicated as some of soft's God-logging that came from 1.24->1.25 was in here. Fortunately, the conflict was trivial (missing include) idnra/newsim/simulator.cpp : one small conflict. Kept the 1.25 version of SKU/product stuff, as it was likely part of the homestead stuff that was recently put into 1.25. However, there was some code after that in the merge conflict that had been removed from trunk that I also removed in the resolution. This code is 27 lines starting at the comment "Asset cache service", as can be found in the server-1.25 branch. indra/newsim/tests/fakeobjects.h : kept the trunk version. No changes to 1.25 after parcel stats merge, except for a compile error fixed by andrew about which he warned there would be merge issues... indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp indra/newsim/llparcelstats.h : same as llgettaskstats.cpp indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a fix that josh made both to trunk and 1.25 indra/newsim/llscriptdata.h : same as llscriptdata.cpp indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that there was an additional change to trunk (so doing "svn revert" to keep trunk is still the right thing) indra/backbone/multiagentchat.py : where there were conflicts, kept the server-1.25 version. Phoenix had put in some fixes for dealing with omissions of the accept header in the 1.25 branch. indra/backbone/group_linden_dollar.py : similar to multiagentchat.py. All but one or two conflicts were utterly trivial (missing blank line) indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly trivial (missing blank line); I'm surprised svn got all fussy about them. indra/lib/python : conflict was because the externals had been futzed with in 1.25 during debugging of backbone memory bloat. Kept the externals as in trunk.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165