76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73cacahttp://opensimulator.org/mantis/view.php?id=5569 , I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:07:12 +00:00
cb4509f3b8
Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
...
irreversible y-flip and holes in the map.
2012-02-21 21:34:02 +01:00
dede31174e
Merge branch 'master' into careminster
2012-02-21 22:08:34 +00:00
7cf970fb27
V3 Support:
...
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
2012-02-21 14:21:03 -05:00
0e4d5a4d3c
Also preserve angular velocity on crossing.
2012-02-21 10:10:04 +01:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
a27e5a9c95
Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64
2012-02-21 04:12:17 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
a15b00d3ef
Replace previous windows 64-bit sqlite3.dll with one from http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip
...
In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll
This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not.
This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference.
This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
2012-02-21 04:01:27 +00:00
1b906ef2ad
Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either.
2012-02-21 03:24:01 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
90dc5f47e7
Fix bug where NPCs would establish child agents on other neighbour regions that had come up after the NPC was created.
2012-02-21 01:57:19 +00:00
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
ee62bf3c69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-20 20:23:14 +01:00
3b2900e884
Merge branch 'master' into careminster
2012-02-20 19:48:28 +00:00
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
99b9c1a9d5
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 10:58:07 -08:00
d6b8febbf4
Make vehicles retain velocity when crossing between regions.
2012-02-20 19:49:01 +01:00
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
b489c85226
Amend to last commit. This should have been committed too.
2012-02-19 15:37:37 -08:00
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
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
77575ec51b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 20:36:26 +01:00
756baff86a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-19 21:14:18 +00:00
4bc3a0ecf4
Uncomment serialization
2012-02-19 20:25:20 +01:00
433d5f1d3e
Merge branch 'ubitwork'
2012-02-19 20:24:00 +01:00
3c9b7f2c0c
simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs
2012-02-19 19:27:01 +00:00
d6f212059e
Fix merge issues in prebuild
2012-02-19 20:17:47 +01:00
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
60d68ee312
Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing
2012-02-19 18:10:00 +00:00
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
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
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
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
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
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
7a1ab03b75
missing paramenters init plus some cleaning
2012-02-18 19:31:36 +00:00
a62baf8ea4
added a EnUsCulture whatever that is..
2012-02-18 18:37:29 +00:00
028dc1f4ed
a bit less human readable xml
2012-02-18 18:33:41 +00:00
70b3b599bc
added some ToXml2 to SOGVehicle ( unused untested )
2012-02-18 18:25:48 +00:00
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
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
Justin Clark-Casey (justincc)