| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| | |
| |
| |
| |
| |
| |
| |
| | |
from ODEPrim.SetGeom.
This occurred in 7a574be3fd from Sat 21 Apr 2012.
This should fix collision detection.
Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
disableBody() sets Body == IntPtr.Zero on all code paths.
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| | |
position as well as the body position
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
(sqrt(2)) rather than doing it multiple times on every move.
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
|
| | |
| |
| |
| |
| |
| | |
the same time.
Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
|
| |\ \
| |/
| |
| | |
Conflicts:
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| |/ |
|
| | |
| |
| |
| | |
in whilst testing
|
| | |
| |
| |
| |
| |
| |
| | |
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
|
| |\ \
| |/
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
prevent ODE crashes on simulators running more than one region.
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
|
| | |
| |
| |
| | |
error log lines.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
|
| | |
| |
| |
| | |
hunting. No functional changes.
|
| |\ \
| |/ |
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| | |/
| |/| |
|
| | |/ |
|
| | |
| |
| |
| | |
constructor
|
| | |
| |
| |
| |
| |
| | |
when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
Eliminate some copypasta for height setting in OdeCharacter
|
| | |
| |
| |
| |
| |
| | |
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
|
| | | |
|
| |\ \
| |/ |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
of just a _taintedPrims HashSet.
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
|
| |\ \
| |/ |
|
| | | |
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
|
| | | |
|
| |\ \
| |/ |
|
