a3066b7375
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-06-20 16:11:33 -04:00
74957676fc
SL-694 - message changes for ObjectAnimation, more logging to validate behavior
2017-06-05 20:22:59 +01:00
55612611c6
SL-694 - stub support for ObjectAnimation message type
2017-05-30 22:03:43 +01:00
fe64db61d6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-05-22 21:30:26 -04:00
806fd24704
merge
2017-05-22 21:09:07 +01:00
880be86cf2
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
2017-03-10 15:07:55 -08:00
f028290c9e
SL-409 - added size stats to metrics for textures
2017-03-07 08:06:03 -05:00
015463c731
merge
2017-03-06 14:42:48 -05:00
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
f70abb4ad6
SL-409 - added tracking for bytes fetched to viewer assets metrics (does not currently work for textures)
2017-03-03 15:14:09 -05:00
fdfa832f4d
SL-409 - simple script to summarize viewer metrics logs of asset fetches
2017-03-01 18:10:24 -05:00
971ea9f3d7
MAINT-7005 - added ability to set base priority and joint priority in anim_tool.py
2016-12-21 16:18:51 -05:00
295a4c63b4
merge changes for 5.0.0-release
2016-12-05 17:40:04 -05:00
3a8aa2d13d
add viewer channel and version to the beginning of the About box Licenses information
2016-12-02 10:59:06 -05:00
8df3092c8b
SL-455 - tweaks to skel_tool.py
2016-09-20 08:08:55 -04:00
a11538e034
SL-455 - skel_tool.py check for avatar_lad.xml slider symmetries
2016-09-12 16:50:32 -04:00
b5bbb9f5d5
SL-109 - in skel_tool.py, added check for bone drivers that don't do anything.
2016-09-12 10:48:35 -04:00
5521066237
SL-109 - added another diagnostic option for skel_tool.py. --slider_info dumps the info about bone-affecting sliders to stdout
2016-09-02 08:15:54 -04:00
9d8986337a
SL-242 - fix for slider param groups, added default args for skel_tool.py
2016-07-08 15:36:50 -04:00
b2a67c00b0
SL-353 - anim_tool.py has more reasonable default location for skeleton and lad files
2016-06-21 17:23:35 -04:00
27bb57126c
SL-353 - additional anim_tool.py option, --num_pos, to enable creation of large test files
2016-06-14 10:54:30 -04:00
b5f4eab65b
SL-117, SL-315 - resetSkeleton() tweaks, additional validation of skeleton file
2016-05-26 12:52:09 -04:00
7a7973c6a2
SL-315 - arche_tool.py updates, resetSkeleton() now preserves mPelvis state, forces all params to be updated.
2016-05-25 16:40:08 -04:00
806969c11c
SL-315 - added arche_tool.py, a basic script for comparing 'Dump XML' output files
2016-05-25 09:40:45 -04:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
a46fdc10c7
SL-315 - option to skip hud joints in anim_tool.py
2016-05-19 13:11:45 -04:00
bb2c147c26
SL-315 - fix for max/linux build failure, additional lad validation in skel_tool.py
2016-05-18 09:06:46 -04:00
184a5fd82b
SL-315 - resetSkeleton() work, dae_tool.py can add random joint positions to models
2016-05-09 10:25:30 -04:00
ec471497f5
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
2016-04-29 11:25:17 -04:00
3da9762eee
SL-374, SL-375 - dae_tool.py for dae manipulation, initially to make joint offset test content
2016-04-28 13:44:36 -04:00
f3fb80c947
SL-344 - fixed a problem in avatar_lad with some params in wrong group, added diagnostics to make this easier to detect.
2016-04-27 17:19:09 -04:00
dd0d9319d9
make the About... / Licenses tab more readable by adding blank lines
2016-04-20 17:51:30 -04:00
5adc782341
SL-353 - improved handling of skeleton and lad options in anim_tool.py
2016-04-13 16:53:17 -04:00
9012a8a087
SL-338 - added --set_version to anim_tool.py, for creating files to test upload of unsupported file versions.
2016-04-12 11:09:54 -04:00
67eb559dc7
SL-344 - additional sliders, additional avatar_lad validation in skel_tool.py
2016-04-11 21:19:22 -04:00
5574e3bbaa
SL-353, SL-344 - basic avatar_lad validation in skel_tool.py script.
2016-03-25 10:28:30 -04:00
bf9626c0a9
SL-353 - bento: utilities for skeleton and anim file manipulation.
2016-03-24 13:32:05 -04:00
d048afe845
MAINT-5743 Fixed Remove gpu_table and references to it from viewer packaging
2015-11-02 20:31:15 +02:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
a49e11efd9
remove check-viewer-xml (moved to the viewer-test-tools repo)
2015-04-14 10:44:16 -04:00
6b9b4c91d1
Detect running under cygwin and fail gracefully
2015-04-09 11:12:47 -04:00
136a925536
add script to check xml files written by the viewer
2015-04-02 16:01:17 -04:00
8e21b24a07
merge changes for 3.7.26-release
2015-03-23 14:34:31 -04:00
355d006851
Rationalize use of AUTOBUILD environment variable across languages.
...
Ensure that AUTOBUILD is always in native path syntax on every platform.
Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh
has set it properly, or scream for help.
Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a
local 'autobuild' variable using shell_path.
Remove kludges in other languages involving cygdrive twiddling.
2015-01-08 16:48:29 -05:00
3d98ef6b08
Remove obsolete build script with ancient, erroneous hardcoded paths.
2015-01-08 16:44:27 -05:00
9635923d55
Temporarily work around cygwin /cygdrive/c pathname in AUTOBUILD.
2014-12-22 15:27:28 -05:00
6539fe4a67
SL-92 WIP - track appearance message timing
2014-12-16 09:14:18 -05:00
20de60576f
Wrap call to autobuild in some diagnostic code.
...
Hopefully this will make certain errors clearer, notably failure to launch
autobuild due to "cannot find the file specified".
2014-12-12 14:33:20 -05:00
c9981ec59c
SL-92 WIP - hover height communicated via appearance messages.
2014-12-08 13:12:28 -05:00
680194deaf
automate keeping the About SL -> Licenses tab correct
2014-11-21 18:09:12 -05:00
73b277b83b
Fixed windows line endings
2013-12-09 13:47:41 -08:00
27cf0ec7f3
Merge with 3.6.11
2013-12-02 15:44:02 -08:00
c2c060d440
Merge with 3.6.7
2013-10-04 09:19:25 -07:00
0103cac1dd
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
2013-09-26 11:44:40 -07:00
09964ec6ed
Created an experience specific permissions dialog.
2013-09-24 19:10:43 -07:00
b76c51b942
Merge viewer-storm-1552 changes for gpu/feature table stomp from wi-fi
2013-09-06 06:43:52 -07:00
980802e468
STORM-1552: detect, ignore, and delete invalid feature and gpu table files
2013-09-05 22:06:16 -04:00
d5c9b7b8e5
fix header display for diff report
2013-08-29 09:56:44 -04:00
e51e79c4d4
truncate gpu id strings to 100 characters (avoids diff problems)
2013-08-07 18:04:03 -04:00
4ae06c7e33
add line number of recognizer to diff report
2013-08-07 18:03:16 -04:00
c19f427ce1
update tester for new gpu_table.txt format
2013-07-10 14:35:25 -07:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
d7e90f4160
derive version number from indra/VIEWER_VERSION.txt
2013-02-07 11:56:57 -05:00
87833a2485
Fixed issues with mixed grids - new message blocks now variable
2012-08-27 17:37:34 -04:00
64d9705ae2
Expanding region flags to 64 bits. Adding region protocol flags
2012-08-17 03:56:38 +00:00
dfce4c451c
Added AppearanceData block to AvatarAppearance message
2012-08-02 22:54:01 +00:00
066d63022b
fix typo in flag for -u option
2011-10-06 16:30:32 -04:00
466b9d7aeb
add --diff option to display change report, other minor improvements
2011-09-23 10:18:01 -04:00
0665d3f2e6
lowercase gpu string and recognizers in gpu_table_tester to match the behavior of the real code
2011-09-13 10:51:31 -04:00
5b42f6f25b
modify gpu_table_tester to lowercase things the way that the real gpu table parser does
2011-09-13 10:00:03 -04:00
3958c5fe71
make script executable
2011-09-12 12:10:46 -04:00
9df77524fc
only include the h file when it is being created, and make the #endif in the h file safer for picky compilers
2011-09-12 07:21:22 -04:00
49d0e291d8
add templates for use with hg-tools/create.py
2011-09-11 10:01:38 -04:00
d6f7526abf
Merge
2011-05-24 14:28:25 -07:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
27fd0d1a93
storm-1100: merged many more updates and refinements to table, added tester and files to test with
2011-05-13 13:27:56 -04:00
37c15d211b
Merge
2011-04-05 10:36:41 -07:00
a03f6997d8
update message template hash to correct value
2011-04-01 12:08:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
cf4d929888
STORM-956 update message template
2011-04-01 06:49:19 -04:00
6540ccd307
Updated message template hash.
2011-03-31 16:15:48 -07:00
44ad672b9e
Apply server side code to message template verification onto the viewer tree.
2011-03-31 15:43:47 -07:00
0080ed8e29
Merge
2011-03-31 14:07:54 -07:00
675e0cfd99
Use tcmalloc from 3p-google-perftools on windows
2011-04-11 14:12:49 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
f360ce118d
Add template .sha1
2011-03-03 12:14:10 -08:00
6e97ead181
Add early exit to message template check if it hasn't changed.
2011-03-03 12:05:40 -08:00
dfafbf9f12
Automated merge up from viewer-development into mesh-development
2011-02-18 10:23:08 -05:00
c190189057
merge changes for storm-937
2011-02-17 14:56:33 -05:00
10cf492ef1
STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code
2011-02-11 16:56:28 -08:00
896bc12a2b
STORM-937 : Fix python scripts shebang line and license header for consistency
2011-02-09 15:23:07 -08:00
01dd9929e2
STORM-937 : Makes all python paths use consistent syntax
2011-01-28 16:00:57 -08:00
e4392e6ae9
bye bye install.py...
2011-01-14 15:38:30 -08:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
429e0caf17
SNOW-744: scripts/install.py --uninstall does not remove symbolic links.
...
This fixes the problem that when some package contains symbolic
links, they were never removed anymore (after an uninstall of
that package).
2010-12-15 17:31:18 +01:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
0670e889f9
Replace template verification code with an md5sum check.
2010-11-16 12:15:00 -08:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
a36033853a
STORM-168 : Python modules cleanup
2010-09-16 14:27:42 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f0d3cfc7bb
Unix EOL
2010-07-09 17:48:27 -07:00
3733337011
Gravity, Friction, Restitution, Density now work with simulator.
2010-07-09 17:47:58 -07:00
2530b057bb
added new physics parameters to prims
2010-07-01 17:18:55 -05:00
71dfe17fd1
Updated to latest MoneyBalanceReply message format
2010-04-02 09:45:17 -07:00
7381679cd0
Add TransactionInfo to MoneyBalanceReply, unpack test data
2010-04-01 10:15:37 -07:00
b2381a039d
DEV-47845 Cleaned up names.
2010-03-31 17:35:26 -07:00
92257b55a4
DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset.
2010-03-26 18:23:05 -07:00
96f29d2ba0
Update message template to agree with server-1-36
2010-02-11 18:58:33 -05:00
5fc9d8bdda
Remove a tab character from the end of a line to pass policy requirements.
2010-01-20 11:46:40 -08:00
c252f122e3
DEV-45037 Attackers can request files from viewer cache
2010-01-19 19:42:13 -06:00
5c0f263403
Replace scripts dependency on win32api module with bundled ctypes.
2010-01-14 16:46:20 -05:00
66cf090114
Adding new option definition - forgot.
2009-11-06 15:54:11 -08:00
99f75c9bca
Add support for externally specified revision number (codeticket)
2009-11-06 15:52:51 -08:00
65bf35cfed
merge
2009-10-19 10:49:48 -07:00
477c2acffa
Cosmetic change. Took out unnecessary blank line near the end of LinkInventoryItem in message_template.msg.
2009-10-16 20:40:16 +00:00
bc4444cd78
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
2009-09-26 18:08:24 -04:00
053b14a97a
Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805.
...
Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
2009-09-17 16:53:36 +00:00
5b428d3a63
Merge with SVN trunk
2009-09-08 12:25:35 -07:00
74e584add6
svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
...
Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804
2009-09-04 18:16:21 +00:00
ff11d74820
Add Mercurial-specific build version info.
...
Pilfered from billc.
2009-08-26 10:57:38 -07:00
2c31217cc9
svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4
...
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
2009-07-29 17:36:46 +00:00
17b9cda432
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
...
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
2009-07-24 00:46:26 +00:00
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
5f4c09fa1f
Python 2.4 and 2.6 improvements
...
The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it
The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back
Reviewed by Poppy.
2009-06-22 22:36:36 +00:00
9a8d069902
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
2009-05-19 17:16:44 +00:00
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
4bcbf33422
svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
...
QAR-1459 etch builds enabled
2009-04-30 06:52:38 +00:00
d5aad9ebc3
svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
2009-04-21 20:08:05 +00:00
664f27380c
merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
...
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-04-13 21:03:44 +00:00
72c5076d6e
Working around DEV-30401 by yanking the etch 32bit build code until the viewer also builds on etch
2009-04-10 01:15:27 +00:00
1aca3ff6f5
Get 32-bit builds going on 64-bit Debian Etch.
...
Reviewed by Brad.
2009-04-09 18:05:56 +00:00
24b26d71ee
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
c88b470a8a
svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
The biggest things in this are Scalable Space Servers and Maint-Server-6
QAR-1209 : SSS
QAR-1295 : maint-server-6
Conflicts resolved by prospero:
C scripts/farm_distribute
C scripts/automated_build_scripts/build-linux.sh : resolved by
prospero, mostly kept the merge-right version in
the conflict, but there was one block of repeated
code from earlier that I removed.
C scripts/automated_build_scripts/build-mac.sh : kept merge-right
C indra/llcommon/llversionserver.h : svn revert
C indra/newsim/llsimparcel.h : kept *both*... working had "setArea",
merge-right had exportStream and importStream
C indra/newsim/llsimparcel.cpp : see llsimparcel.h
C indra/newsim/lltask.h : working had LLTask derived also from
LLScriptResourceConsumer, merge-right had LLTask
dervied also from LLAgentPosition. To resolve
conflict, derive from both.
C indra/newsim/lllslmanager.h : kept merge-right (had an added comment)
C indra/llmessage/llhttpnode.h : kept working (added the definition
of method LLHTTPNode::extendedResult)
C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp
C indra/lscript/lscript_execute_mono/llscriptexecutemono.h
: These two were resolved by si, in consultation with daveh
I also had to add the following stubs to
indra/newsim/tests/llgodkickutils_test.cpp in order to get it to
compile:
// LLScriptResourceConsumer interface methods in LLTask
LLScriptResource::LLScriptResource() { }
LLScriptResourcePool::LLScriptResourcePool() { }
LLScriptResourcePool LLScriptResourcePool::null;
LLScriptResourceConsumer::LLScriptResourceConsumer() { }
LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; }
const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; }
bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; }
bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; }
bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; }
void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { }
S32 LLTask::getUsedPublicURLs() const { return 0; }
void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2009-02-25 21:02:17 +00:00
c72df34847
Drop linux32 support from install.xml and install.py, since unused and untested
2009-02-24 21:24:36 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
c52e690933
make it easer for developers to examine list output by sorting the results prior to display. DEV-25457
2008-12-29 18:55:00 +00:00
Nat Goodspeed