| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
|
|
|
|
new 32-bit mouse cursors were not getting packaged by installer for windows builds
reviewed by Monroe
|
|
viewer channel name.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
only the obvious icon files are replaced
--HG--
branch : product-engine
|
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
to use the repo revision number for now.
|
|
|
|
viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
|
|
ignore-dead-branch
|
|
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.
|
|
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
|
|
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.
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 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
|
|
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
|
|
match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
|
|
|
|
release
reverting jakes accidental check in
|
|
all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
|
|
svn+ssh://svn/svn/linden/release into release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
|
|
|
