summaryrefslogtreecommitdiff
path: root/indra/newview/res/viewerRes.rc
AgeCommit message (Collapse)Author
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-08fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-05-15STORM-859 : Replacing winres.h with windows.h so that the viewer will build ↵Wolfpup Lowenhar
with-out having to copy any files to the source tree when useing express versions of Visual Studio.
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-11Updated viewer patch number & channelDessie 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-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-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
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-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-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.
2008-12-05merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunkDave Kaprielian
2008-10-01svn merge -r96886:98039 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
2008-09-23merge -r97452:97484 ↵Dave Kaprielian
svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2
2008-08-12Revert excess changes from previous commit - I hate it when that happens.Christian Goetze
2008-08-12svn -c 94141 merge ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
2008-07-31svn merge -r93014:93396 ↵Dave Hiller
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers