b756077269
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-29 12:18:22 -08:00
70e36ee2b4
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
2011-12-29 12:17:58 -08:00
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
5b52440e61
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-28 09:24:02 +00:00
bf4d727cd5
Fix permissions being lost and correct slam behavior, removing icompatible
...
code inherited from core and dead code.
2011-12-27 14:04:49 +01:00
ad1c6442cd
Remove a debug spam
2011-12-27 01:40:44 +01:00
f36fe45fa7
Add Copy task to Prebuild.exe (vsxxxx targets)
...
<Files>
<Match pattern="*.cs" recurse="true"/>
<Match pattern="../bin/MyConfig.xml" buildAction="Copy" recurse="false" destination="$(OutputPath)" />
</Files>
2011-12-25 00:04:42 -05:00
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
41f6d6a5ff
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-24 16:18:01 +01:00
2e07d24199
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:46:04 +01:00
c4e16b26bb
Merge branch 'master' into careminster
2011-12-24 02:21:35 +00:00
c9dbcfbb31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:43:44 +01:00
f2855d3668
Add setter for Acceleration on physics objects.
2011-12-24 01:41:32 +01:00
5b28e29530
Fix camera orientation for sit targets to use the prim actually sat on.
...
Now SL compatible.
2011-12-24 01:40:58 +01:00
04806e02ed
Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.
...
For SL compatibility only
2011-12-24 01:40:09 +01:00
f9a1fd5748
HG: one more adjustment with trailing /s
2011-12-23 15:08:13 -08:00
d38b8caf2b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-23 10:58:55 -08:00
26bb95fe3d
HG: AAdded a few missing /'s at the end of URLs
2011-12-23 10:58:30 -08:00
c6ce464dbc
remove the old region crossing handler
2011-12-23 10:13:32 -08:00
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
456c89a7a3
Fixes some problems with objects that attempt to cross a region boundary
...
into a region that does not exist. This is particularly problematic for
physical objects where the velocity continues to move them out of the
region causing an infinite number of failed region crossings. The patch
forces an object that fails a crossing to be non-physical and moves it
back into the starting region.
2011-12-22 16:59:51 -08:00
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
6b08c051a3
Enables processing of hypergrid links through simiangrid services. Thanks
...
otakup0pe
2011-12-22 15:31:51 -08:00
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
a15a58a7c1
Merge branch 'master' into careminster
2011-12-22 17:33:31 +00:00
469955889e
Region crossings redone: (1) removed WaitForCallback. Now that we are passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
2011-12-22 09:30:06 -08:00
b72dd852b7
Merge branch 'master' into careminster
2011-12-22 16:58:38 +00:00
7f527814d5
And a typo fix
2011-12-22 16:57:49 +00:00
66a0471efa
Merge branch 'master' into careminster
2011-12-22 16:52:14 +00:00
6412349dec
Add a few comments, correct a merge artefact
2011-12-22 16:51:51 +00:00
c63d5f8e0c
Merge branch 'master' into careminster
2011-12-22 16:49:15 +00:00
2347593dac
Harmonizing SP with Avination
2011-12-22 16:48:52 +00:00
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
219ec7ef20
Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way.
2011-12-22 08:18:03 -08:00
bb0c6a498b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-21 15:17:44 -08:00
ddff2f246c
Moved an external test into the method that uses those preconditions.
2011-12-21 15:17:26 -08:00
651f9f47d0
HG: Verify that the user is local
2011-12-21 14:56:38 -08:00
7693e6a3a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 14:46:44 -08:00
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
a1dc4e830d
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 13:40:24 -08:00
fa0a71253f
Though the viewer warns about receiving this, not sending appears to break baked texture caching when crossing region boundaries.
...
Needs further investigation.
Revert "Stop sending the viewer its own AvatarAppearance packet."
This reverts commit 92039f295d
2011-12-20 18:54:15 +00:00
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
2b4ebe657c
Merge branch 'master' into careminster
2011-12-19 23:16:20 +00:00
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
Diva Canto