UbitUmarov
54e1d54fb5
fix more merge issues
2015-11-01 03:33:19 +00:00
UbitUmarov
24472c3b67
fix merge issues
2015-11-01 03:25:36 +00:00
UbitUmarov
72684592ba
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
UbitUmarov
9ba288a2e7
fix typo reported on mantis 7735
2015-10-31 22:48:31 +00:00
UbitUmarov
af4ca8e80e
fix internal support for non square regions
2015-10-31 21:58:40 +00:00
Melanie Thielker
ea56f4f27c
Introduce an EntityTransferContext carrying the version numbers to pass
...
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
2015-10-31 18:13:02 +01:00
Melanie Thielker
e8e0ba6d8f
Remove testing cruft that is blocking the new protocols. Unit tests no
...
longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
2015-10-31 17:22:27 +01:00
UbitUmarov
ed909f56da
fix mantis 7734, Thanks Garmin for the report
2015-10-31 13:22:50 +00:00
UbitUmarov
9232876421
let silly tests override version on local connections
2015-10-31 02:05:11 +00:00
Melanie Thielker
f0fd028ed9
Merge branch 'master' of opensimulator.org:/var/git/opensim
2015-10-31 00:06:34 +01:00
Melanie Thielker
dc6d9eadf3
Testing stage of the new versioning system. Use at own risk. May not
...
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
UbitUmarov
dd9b06e3b6
fix mantis 7733, reverting setting of IsAttachment on first call to full check. Replace instead same simple IsAttachment tests by full checks
2015-10-29 22:14:11 +00:00
UbitUmarov
114ac59314
dont tell clients that we can edit a friend's attachments when we do forbid it
2015-10-27 01:20:21 +00:00
UbitUmarov
9e6d9e0436
friends rights to edit objects display on viewers fixed. This needs to be optimized in future
2015-10-27 01:17:32 +00:00
UbitUmarov
1982d72320
Make changes to a friend rights reach him on another sim; find on map does show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing...
2015-10-26 22:42:48 +00:00
UbitUmarov
6821ace3c6
add basic SendFindAgent() to lludp. Future use may require a list of pairs (X,Y). For now one pair is good enough.
2015-10-26 21:56:02 +00:00
UbitUmarov
8922d58f05
try fix IRC connector issue on mantis 7731 but with code a bit diferent from proposed patch. Also append '@irc' to nick on region messages, so message origin is clear
2015-10-26 18:00:01 +00:00
UbitUmarov
c3532ba876
set SOG.IsAttachment when doing a full check, so future gets see the right value
2015-10-25 19:59:05 +00:00
UbitUmarov
8d33ab903b
merge issue: fix missing '/'
2015-10-24 22:48:31 +01:00
UbitUmarov
28d4afbe3a
replace objects scale clamp by a more readable clamp. Simplify GroupResize and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again.
2015-10-23 01:39:53 +01:00
UbitUmarov
8ed17f745d
let ode also finish internal representation of prim actors, before simulation
2015-10-22 18:03:49 +01:00
UbitUmarov
7cb6ecb9f5
Make physics engines finish internal representation of loaded prims before starting simulation so it does start for all at same time. Currently only in use by ubOde
2015-10-22 17:34:28 +01:00
UbitUmarov
7aaa84515f
rename terrain for opensim and respective configuration flag that a future costumized ODE library may have
2015-10-22 16:20:19 +01:00
UbitUmarov
e464bf5d82
recover scripts execution time stat i lost on previus changes. Behing async, this will not add with other time stats giving total frame time, as happens on other simulators. But its a good diag stat.
2015-10-21 18:34:06 +01:00
UbitUmarov
f84b75b1e0
update ubOde hashspaces levels
2015-10-21 01:50:28 +01:00
UbitUmarov
44deac4c1e
we do not have prims with size 2^128, missing file
2015-10-21 01:41:04 +01:00
UbitUmarov
c37ea1910d
fix or remove some wrong ODE configuration settings
2015-10-21 01:11:39 +01:00
UbitUmarov
deb4364f42
remove the use of Vector3 for axis locks on the rest of engines
2015-10-21 00:15:09 +01:00
UbitUmarov
ce5d5fc8dc
the inertia matrix inversions and body inertia changes to implement axis locks need to be avoid, so use ubOde axis locks code. Hopefully this will not cause incompatibilities
2015-10-21 00:01:23 +01:00
UbitUmarov
747044f587
stop using a vector3 to store axis locks 3bit flags also in ode
2015-10-20 23:57:57 +01:00
UbitUmarov
f6891b36be
stop using a vector3 to store axis locks 3bit flags in ubOde
2015-10-20 19:33:15 +01:00
UbitUmarov
0045398324
move ugly convertion of axis locks 3 bit flags to a wasted vector3 down to PhysicsActor. Let engines use LockAngularMotion with either Vector3 argument or byte
2015-10-20 19:00:26 +01:00
UbitUmarov
d8528a7ba0
add axis locks to sop serializer. Now they are also saved to inventory
2015-10-20 18:37:24 +01:00
UbitUmarov
3c69071145
also apply axis locks, when creating a prim physics actor
2015-10-20 18:21:13 +01:00
UbitUmarov
52860a7d15
stop using a Vector3 to store 3bits
2015-10-20 16:55:18 +01:00
UbitUmarov
dfd60d6f71
STATUS_ROTATE are linkset flags and not prim
2015-10-20 15:37:43 +01:00
Diva Canto
59b63b6406
On to 0.8.3!
...
Conflicts:
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto
839e239c99
Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions.
2015-10-18 21:50:11 -07:00
Diva Canto
06d2508b96
On to 0.8.3!
2015-10-18 21:47:10 -07:00
Diva Canto
e6163c990e
Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions.
2015-10-18 16:59:47 -07:00
Diva Canto
7ab633461e
Fixed merge conflicts
...
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090
Clean up of simulation version, the number that rules the compatibility of teleports:
...
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
UbitUmarov
a31e5e799e
stop a object when making it not physical
2015-10-18 00:35:52 +01:00
UbitUmarov
24435cfe9a
Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child prim and stop using unnecessary trimeshcallbacks
2015-10-17 21:56:15 +01:00
UbitUmarov
e2d7e6290d
fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo.
2015-10-17 20:07:52 +01:00
UbitUmarov
8dcb4de53c
fix GetTerrainHeightAtXY for large regions. Also change ode dispose()
2015-10-17 14:42:04 +01:00
UbitUmarov
f39e6bc482
bug fix. Some rare meshs reported as having +-infinity dimensions
2015-10-15 19:06:39 +01:00
Diva Canto
e14e432b50
More exception catching in ODE at shutdown. Not sure why the exception happens.
2015-10-14 17:57:13 -07:00
Diva Canto
366e81b977
Also restoring proper function for Simian external GetTexture functionality.
2015-10-14 14:45:21 -07:00
Diva Canto
45b8e6c1a7
Fixed exception upon shutting down in plain ODE.
...
09:49:57 - [SHUTDOWN]: Ignoring failure during shutdown - System.NullReferenceException: Object reference not set to an instance of an object.
at OpenSim.Region.PhysicsModule.ODE.OdeScene.Dispose() in f:\dev\opensim-core\OpenSim\Region\PhysicsModules\Ode\OdeScene.cs:line 4062
2015-10-14 09:56:23 -07:00
