Melanie
d6b8febbf4
Make vehicles retain velocity when crossing between regions.
2012-02-20 19:49:01 +01:00
Melanie
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
Melanie
77575ec51b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 20:36:26 +01:00
Melanie
756baff86a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-19 21:14:18 +00:00
Diva Canto
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
Diva Canto
20c65ac438
A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
2012-02-19 12:28:07 -08:00
Melanie
4bc3a0ecf4
Uncomment serialization
2012-02-19 20:25:20 +01:00
Melanie
433d5f1d3e
Merge branch 'ubitwork'
2012-02-19 20:24:00 +01:00
UbitUmarov
3c9b7f2c0c
simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs
2012-02-19 19:27:01 +00:00
Melanie
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
UbitUmarov
60d68ee312
Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing
2012-02-19 18:10:00 +00:00
BlueWall
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
Melanie
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
UbitUmarov
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
Melanie
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
PixelTomsen
d22715126c
Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 01:58:28 -07:00
PixelTomsen
a114367b9b
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org >
2012-02-19 01:00:01 -07:00
Diva Canto
2ffc055f7e
This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!
2012-02-18 21:59:42 -08:00
UbitUmarov
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
Melanie
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
UbitUmarov
7a1ab03b75
missing paramenters init plus some cleaning
2012-02-18 19:31:36 +00:00
UbitUmarov
a62baf8ea4
added a EnUsCulture whatever that is..
2012-02-18 18:37:29 +00:00
UbitUmarov
028dc1f4ed
a bit less human readable xml
2012-02-18 18:33:41 +00:00
UbitUmarov
70b3b599bc
added some ToXml2 to SOGVehicle ( unused untested )
2012-02-18 18:25:48 +00:00
UbitUmarov
3aee642190
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
2012-02-18 17:42:14 +00:00
UbitUmarov
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
UbitUmarov
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
BlueWall
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
BlueWall
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
BlueWall
7bdcf9eb26
Propagate our teleport flags on logins
2012-02-18 00:32:09 -05:00
Justin Clark-Casey (justincc)
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00
BlueWall
fbccff4994
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 21:15:18 -05:00
Justin Clark-Casey (justincc)
84184708de
Fix a bug where changing shape parameters of a child prim in a linkset would not persist.
...
Resolves http://opensimulator.org/mantis/view.php?id=5819
2012-02-18 01:15:43 +00:00
BlueWall
8f8b478d36
Parcel sales support to SQLite
2012-02-17 20:04:38 -05:00
Justin Clark-Casey (justincc)
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
BlueWall
d03e878d53
Fillin missing SQLite support for Telehubs
2012-02-17 17:31:20 -05:00
Dan Lake
b313d16493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 13:51:54 -08:00
Dan Lake
784263f5e3
Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
2012-02-17 13:45:45 -08:00
UbitUmarov
7d77ccc659
Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken
2012-02-17 21:09:00 +00:00
Robert Adams
6baa13ab7a
Add new and updated script events
2012-02-17 09:12:41 -08:00
BlueWall
0e16e0fb6a
Merge branch 'master' of /home/opensim/src/opensim
2012-02-17 08:21:33 -05:00
BlueWall
ba98d6fffe
Fix missing telehub handling on login
2012-02-17 08:03:53 -05:00
Justin Clark-Casey (justincc)
972f73ed2b
Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAnimation()
2012-02-17 02:53:12 +00:00
BlueWall
c5ff37bf3e
Merge branch 'master' of /home/opensim/src/opensim
2012-02-16 09:01:02 -05:00
BlueWall
6b867773a8
Remove some debugging output form the logger
2012-02-16 08:59:34 -05:00
Justin Clark-Casey (justincc)
912aac3447
minor formatting changes from last commit (4486n7d)
2012-02-16 03:37:40 +00:00
PixelTomsen
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
2012-02-16 03:35:18 +00:00
Justin Clark-Casey (justincc)
1267094a51
Turn off logging on test in last commit ( 2b84295).
2012-02-16 03:02:11 +00:00
Justin Clark-Casey (justincc)
2b842958cc
If shape properties fail SOP parsing (e.g. due to commas instead of decimal points) print out one short message listing the failing node names rather than lots of exceptions.
...
Adds skeleton bad float values deserialization test
2012-02-16 02:58:00 +00:00
Justin Clark-Casey (justincc)
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
