| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -2/+1 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Remove a merge artefaci in IsActive handling and restore commented out ↵ | Melanie | 2012-08-03 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | correct one | |||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 2 | -5/+7 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | minor change avoiding a null reference | UbitUmarov | 2012-08-03 | 1 | -2/+4 | |
| | | | | | | ||||||
| | * | | | | clientview IsActive use is broken. Suspend it's use keeping it true ( to | UbitUmarov | 2012-08-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | review later) | |||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 2 | -0/+10 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Make sure the position of a loggin-in agent is within region boundaries since | Melanie | 2012-08-03 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | out of bounds positions cause a rejection of the login. | |||||
| | * | | | | Add a reason message for a code path that lacks one | Melanie | 2012-08-03 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * | | | | merge crap gerge branch 'ubitwork' of ↵ | ubit | 2012-08-02 | 94 | -1292/+3427 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminster | Melanie | 2012-08-01 | 9 | -26/+53 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-01 | 1 | -0/+3 | |
| | | |\ \ | | | |/ | ||||||
| | | | * | Fix a bug in pCampbot grabbing behaviour where an exception would be thrown ↵ | Justin Clark-Casey (justincc) | 2012-08-01 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | if the bot was not yet aware of any objects. | |||||
| | | * | | Create the ability for physics modules to request assets on demand by | Melanie | 2012-08-01 | 3 | -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/opensim | Justin Clark-Casey (justincc) | 2012-08-01 | 3 | -12/+14 | |
| | | |\ | ||||||
| | | | * | BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵ | Robert Adams | 2012-07-31 | 2 | -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 Adams | 2012-07-31 | 2 | -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-01 | 1 | -5/+6 | |
| | | |/ | | | | | | | | | | on every single sensor sweep. | |||||
| | | * | Change exception log messages in XInventoryService connector to error rather ↵ | Justin Clark-Casey (justincc) | 2012-08-01 | 1 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | | than debug, since these signal real problems. Also outputs full exception instead of just the message to aid diagnostics. | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 12 | -70/+288 | |
| | |\ \ | | |/ | ||||||
| | | * | Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵ | Justin Clark-Casey (justincc) | 2012-07-31 | 1 | -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-31 | 1 | -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 export | Mic Bowman | 2012-07-31 | 3 | -2/+74 | |
| | | | | | | | | | | | | | constants to the script engine. | |||||
| | | * | BulletSim: add parameters and API calls for setting ERP and CFM. | Robert Adams | 2012-07-31 | 6 | -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 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-30 | 1 | -1/+11 | |
| | | |\ | ||||||
| | | * | | If we're fetching active gestures via the XInventoryServiceConnector, then ↵ | Justin Clark-Casey (justincc) | 2012-07-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | properly look at the ITEMS dictionary already returned rather than the level above this. | |||||
| | * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-01 | 2 | -4/+12 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-07-29 | 5 | -5/+62 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-29 | 1 | -4/+10 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | | | | Return world rotation on llGetObjectDetails()'s OBJECT_ROT | Melanie | 2012-07-29 | 1 | -1/+11 | |
| | | | |_|/ | | |/| | | ||||||
| | * | | | | Fix some merge issues and a functional issue in the scene manager | Melanie | 2012-07-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 61 | -632/+1628 | |
| | |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | SignpostMarv | 2012-07-28 | 3 | -0/+54 | |
| | | | | | | ||||||
| | | * | | | Avoid a race condition between the scene shutdown thread and the update ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -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. | |||||
| | | * | | | making first run more resilient to bad input (loop until good input, rather ↵ | SignpostMarv | 2012-07-27 | 1 | -7/+19 | |
| | | | | | | | | | | | | | | | | | | | | | than crash) | |||||
| | | * | | | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -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. | |||||
| | | * | | | minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | currently calculated dynamically | |||||
| | | * | | | Remove duplicated IScenePresence.PresenceType. This is already in ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required. | |||||
| | | * | | | Remove a couple of compiler warnings pointed out by SignpostMarv | Justin Clark-Casey (justincc) | 2012-07-27 | 2 | -3/+0 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-27 | 6 | -235/+427 | |
| | | |\ \ \ | ||||||
| | | | * | | | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. | Robert Adams | 2012-07-26 | 2 | -4/+4 | |
| | | | | | | | ||||||
| | | | * | | | BulletSim: refactor all the linkset logic out of the prim class | Robert Adams | 2012-07-26 | 4 | -235/+409 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object. | |||||
| | | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2012-07-26 | 2 | -25/+49 | |
| | | | |\ \ \ | ||||||
| | | | * | | | | Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵ | Robert Adams | 2012-07-26 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes exception that happens when shutting down region (improvements from last patch) | |||||
| | | | * | | | | Add a Dispose() of the physics engine when a scene is being shutdown. | Robert Adams | 2012-07-26 | 1 | -0/+9 | |
| | | | | | | | | ||||||
| | | * | | | | | Fix issue where RegionCombinerModule was not removing regions from its ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -0/+2 | |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded). | |||||
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-26 | 5 | -276/+778 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | BulletSim: remove unused, commented out code in BSConstraint | Robert Adams | 2012-07-25 | 1 | -8/+0 | |
| | | | | | | | ||||||
| | | | * | | | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵ | Robert Adams | 2012-07-25 | 2 | -301/+301 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Only it's hairdresser knows for sure) | |||||
| | | | * | | | BulletSim: add parameters for setting linkset constraint factors | Robert Adams | 2012-07-25 | 2 | -17/+32 | |
| | | | | | | | ||||||
| | | | * | | | BulletSim: small change to use the pointer to the bullet object for zeroing ↵ | Robert Adams | 2012-07-25 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | forces. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |