aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-0414-298/+454
|\ | | | | | | | | | | | | | | Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * Merge branch 'ubitwork' into avinationMelanie2012-08-031-0/+7
| |\
| * \ Merge branch 'careminster' into avinationMelanie2012-08-0312-295/+453
| |\ \
| | * \ Merge branch 'master' into careminsterMelanie2012-08-0312-295/+453
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-033-3/+3
| | | | | | | | | | | | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
| | | * | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵Justin Clark-Casey (justincc)2012-08-031-3/+4
| | | | | | | | | | | | | | | | | | | | is already its default value as it's a struct.
| | | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
| | | * | Fixed a rare bug that caused Save OAR to fail because it thought it had ↵Oren Hurvitz2012-08-031-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timed-out The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running.
| | | * | Save membership fee to the database when a group is created.Kevin Cozens2012-08-031-25/+25
| | | | |
| | | * | BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-022-6/+27
| | | | | | | | | | | | | | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
| | | * | Delete old blank SOGSpamTestJustin Clark-Casey (justincc)2012-08-031-37/+0
| | | | |
| | | * | Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵Justin Clark-Casey (justincc)2012-08-031-253/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities.
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-028-4/+55
| | | |\ \
| | | | * | Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | | | | |
| | | | * | reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-025-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | | * | | Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-021-0/+75
| | | | | |
| * | | | | Make WaitGetScenePresence wait for up to 20 secondsMelanie2012-08-031-1/+1
| | | | | |
| * | | | | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
| | | | | |
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-0/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| |/ / / /
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove a merge artefaci in IsActive handling and restore commented out ↵Melanie2012-08-031-2/+1
| | | | | | | | | | | | | | | | | | | | correct one
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| | | | |
| * | | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
| | | | | | | | | | | | | | | | | | | | review later)
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
| |/ / / | | | | | | | | | | | | out of bounds positions cause a rejection of the login.
* | | | merge crap gerge branch 'ubitwork' of ↵ubit2012-08-0275-1260/+3217
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * | | Merge branch 'master' into careminsterMelanie2012-08-017-17/+42
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| | * | Create the ability for physics modules to request assets on demand byMelanie2012-08-013-0/+22
| | |/ | | | | | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-013-12/+14
| | |\
| | | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵Robert Adams2012-07-312-5/+3
| | | | | | | | | | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
| | | * BulletSim: change boolean parameters in the shape data from int's to float's ↵Robert Adams2012-07-312-7/+11
| | | | | | | | | | | | | | | | to be consistant with parameter data structure
| | * | Look up the NPC module when the SensorRepeat class is created, rather than ↵Justin Clark-Casey (justincc)2012-08-011-5/+6
| | |/ | | | | | | | | | on every single sensor sweep.
| * | Merge branch 'master' into careminsterMelanie2012-08-0111-69/+287
| |\ \ | | |/
| | * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-35/+43
| | | | | | | | | | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
| | * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵Justin Clark-Casey (justincc)2012-07-311-3/+6
| | | | | | | | | | | | | | | | | | would base its gain calculation on the previous avatar's gain, instead of the original input gain. This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
| | * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-313-2/+74
| | | | | | | | | | | | constants to the script engine.
| | * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| | | | | | | | | | | | | | | | | | Set ERP and CFM in linkset constraints. Reorder rebuilding of object bodies so they are not rebuilt everytime something is linked and unlinked.
| * | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
| |\ \
| * \ \ Merge branch 'avination' into careminsterMelanie2012-07-295-5/+62
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | | | |
| * | | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-07-2846-613/+1456
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| | * | | LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-283-0/+54
| | | | |
| | * | | Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| | * | | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵Justin Clark-Casey (justincc)2012-07-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
| | * | | Remove duplicated IScenePresence.PresenceType. This is already in ↵Justin Clark-Casey (justincc)2012-07-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required.
| | * | | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-2/+0
| | | | |
generated by cgit v1.1 at 2024-10-25 00:17:55 +0000