540fa84842
Merge branch 'justincc-master'
2013-12-21 01:12:45 +00:00
2f94165dcc
Add lsl arg syntax checking for control event
2013-12-21 01:00:50 +00:00
f1cd813a29
refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for consistency
2013-12-21 00:49:01 +00:00
871ac5b16c
Add arg checking for at_target lsl event
2013-12-21 00:46:34 +00:00
a5e4780547
Add lsl event arg checking for at_rot_target
2013-12-21 00:37:56 +00:00
b757ab2586
Add lsl event argument checking for attach and on_rez
2013-12-21 00:08:36 +00:00
a01862509e
Merge branch 'master' into varregion
2013-12-20 06:52:28 -08:00
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
e298bf41ff
Add missing viewer param elements for butt and breast physics.
...
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
2013-12-19 01:24:36 +00:00
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
6937eec258
Merge branch 'master' into varregion
...
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
141d771a93
Fix issue with editing notes for other avatars
2013-12-16 17:36:21 -05:00
b03ec6137f
Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.
2013-12-16 17:36:04 -05:00
fe01e7d1cc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-16 22:11:03 +00:00
f69e91dc2d
This is the acutal sitting avatar crossing code. This commit implements the
...
actual crossing mechanics for seated avatars, using the supporting code from
the previous commits. Physics is not supported yet, although some few bits
for them are already in place due to the earlier code drops. With this commit,
crossing sitting avatar by "editing" the prim across the border, by using
llSetPos or keyframe motion may already be possible. Vehicles will come next.
2013-12-16 22:08:02 +00:00
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
00e632ec3a
Merge branch 'justincc-master'
2013-12-14 02:49:23 +00:00
51da52f904
Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8
2013-12-14 02:48:29 +00:00
38d7d46c17
Merge branch 'justincc-master'
2013-12-14 02:33:08 +00:00
957449e62c
ParseNotecardToList() returned data past end of notecard text (mantis #6881 ).
2013-12-14 02:25:28 +00:00
ee163b5751
Merge branch 'justincc-master'
2013-12-14 02:23:12 +00:00
e7a294e739
Wrap analysis of the particle system in the UUID Gatherer in a separate try/catch as sometimes it appears that this can be corrupt.
...
As per Oren's suggestion.
2013-12-14 01:48:03 +00:00
996a6c2eea
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
...
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
2013-12-14 01:34:28 +00:00
63ccc3dbf5
Convert if-blocks to return statements in small functions such as GetStartParameter().
2013-12-14 01:20:24 +00:00
bf826699a5
Merge branch 'justincc-master'
2013-12-14 01:13:17 +00:00
d656ec2a07
Make WindParamSet success a console message rather than a log message.
...
This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
2013-12-14 01:07:37 +00:00
5ddd818238
minor: Make wind console commands print out to console rather than log
2013-12-14 00:50:06 +00:00
bcb8c4068e
Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and NPC tests until positions are known to be stable.
...
Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
2013-12-14 00:36:25 +00:00
d2d4ae541b
Fix build break in test from previous commit 54cc229 - hadn't realized ScenePresence inst var name was slightly different
2013-12-14 00:19:04 +00:00
54cc229768
Fix TestSitAndStandWithNoSitTarget NPC and SP tests.
...
These stopped working because current code calculates sit heights based on avatar physics rather than appearance data.
Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
2013-12-14 00:10:32 +00:00
11f177d6a8
Eliminate unnecessary line from my previous commit 1d605642
2013-12-13 23:30:08 +00:00
1d605642f7
Refix sitting on child prims by reinserting relevant code back into SP.HandleAgentSit()
2013-12-11 23:59:52 +00:00
82ebb86d58
Replace proprietary file header with BSD one
2013-12-11 01:51:57 +00:00
92aad6f1bb
Add missing files *blush*
2013-12-11 01:44:03 +00:00
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
3df8990e6f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-12-11 00:14:16 +00:00
97934e00e6
This is the Avination Entity Transfer Module. Surprisingly, it still compiles
...
but I don't know if it runs. Will probably crash and burn as the supporting
code isn't there yet.
2013-12-11 00:12:36 +00:00
0875050161
Add console utility commands "scale scene" and "translate scene". Note that repeated use of these commands will induce floating point accumulation errors. Please back up your region before using.
2013-12-10 13:57:18 -08:00
8f221a3077
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:25:26 -08:00
c0380d1bfe
apparently mono DeflateStream has no CopyTo method =(
2013-12-06 16:24:44 -08:00
5047bd7b44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:02:03 -08:00
4058e5f709
Fixed misleading comment
2013-12-06 16:01:29 -08:00
aba2a44453
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 15:58:51 -08:00
1496de7ce9
use System.IO.Compression.DeflateStream for mesh decompression in an attempt to reduce mesh asset decoding failures
2013-12-06 15:58:19 -08:00
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
4eb52eb19e
Merge branch 'master' into varregion
2013-12-05 21:07:44 -08:00
04f8fc1ce9
Adding profile partners fix to SQLite and PgSQL drivers
2013-12-05 20:25:28 -05:00
823a175f07
Stop writing partner id to record when updating profile data. This should be changed only by admin in backend.
2013-12-05 20:06:04 -05:00
9b76a46df0
Reversing back to the row["ColumnName"] case field name. http://opensimulator.org/mantis/view.php?id=6868
2013-12-06 00:41:02 +00:00
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
Justin Clark-Casey (justincc)