da47bcae3e
When moving the root prim of an attachment: a) Change the attach position; b) Move the other prims in the reverse direction to compensate
2014-01-10 20:24:11 +00:00
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
88f01a4130
When creating a coalesced object, set its permissions to the lowest-common-denominator of all the sub-objects
2014-01-10 20:01:08 +00:00
a94e1e0e08
When creating a coalesced object, set its Creator ID if all the objects have the same creator
2014-01-10 19:54:17 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
0155d42b80
If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems
...
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
2014-01-08 00:54:39 +00:00
1eecb34e62
Remove the core module extra profile settings support carried in with the latest
...
patches. We don't need it.
2014-01-05 21:16:30 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
8d3f242cce
Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster
2014-01-05 20:05:05 +00:00
88b4387abf
Merge commit '5b73b9c4a85335ba837280688b903fef44be8f35' into careminster
2014-01-05 20:04:56 +00:00
b7540be24f
Merge commit '3df8990e6ff6a5293b425e906cd381da9e0424a5' into careminster
2014-01-05 20:04:37 +00:00
c1b44e1721
Merge commit '97934e00e667b6f432340a54671221a970a048d7' into careminster
2014-01-05 20:04:04 +00:00
31279a3308
Merge commit '08750501617ca332ab196b2f25030e3c635c9dd6' into careminster
2014-01-05 20:03:48 +00:00
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
d9848943a9
Add routines in Util.cs for conversion of region handles to region
...
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
2014-01-04 19:01:03 -08:00
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
eab9390e05
Initialize default region size in GridRegion in the no parameter constructor
...
as is used by the grid connector tests.
2013-12-28 07:20:14 -08:00
6869633d76
Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData.
...
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
2013-12-28 06:58:15 -08:00
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
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
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
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
Oren Hurvitz