| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 3 | -2/+11 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-11-01 | 2 | -1/+11 |
| | |\ | |||||
| | | * | more debug | UbitUmarov | 2012-10-28 | 1 | -0/+2 |
| | | | | |||||
| | | * | remove pre physics build testing | UbitUmarov | 2012-10-28 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add some extra debug on scene close | UbitUmarov | 2012-10-28 | 1 | -1/+9 |
| | | | | |||||
| | * | | Make sure we're not accessing a physics scene if we're not in one yet. | Melanie | 2012-10-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Change to earlier commit for TargetVelocity to support distributed physics. | Dan Lake | 2012-11-02 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵ | Dan Lake | 2012-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | No change to existing functions. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -14/+35 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | | | Make "show object part" command correctly display script status. | Justin Clark-Casey (justincc) | 2012-10-31 | 1 | -17/+35 |
| | | | | | | | | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 3 | -6/+24 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-30 | 1 | -5/+9 |
| | |\ \ \ | |||||
| | | * | | | Only create a new list to check if objects have reached targets if there ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | actually are any targets. | ||||
| | * | | | | Store and send the current movement animation state to a new sim on crossing | Melanie | 2012-10-30 | 2 | -0/+17 |
| | |/ / / | |||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-30 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Set the script state to new rez when a scriptis saved, rather than region start. | Melanie | 2012-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving. | ||||
| * | | | | Put back the collision sound shim into SOP | Melanie | 2012-10-30 | 1 | -0/+29 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 3 | -155/+5 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | specifies a UUID rather than a string | ||||
| | * | | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -79/+9 |
| | | | | | |||||
| | * | | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵ | SignpostMarv | 2012-10-29 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | from the root prim rather than the source prim | ||||
| | * | | | Factoring out a superfluous local variable & repeated assignment in ↵ | SignpostMarv | 2012-10-29 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner | ||||
| | * | | | removing superfluous lines from SceneObjectPart.SendSound | SignpostMarv | 2012-10-29 | 1 | -8/+0 |
| | | | | | |||||
| | * | | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 1 | -31/+0 |
| | | | | | |||||
| | * | | | formatting changes to SceneObjectPart.SendSound; consistent indentation | SignpostMarv | 2012-10-29 | 1 | -34/+34 |
| | | | | | |||||
| | * | | | SceneObjectPart.SendSound can exit early if a sound module was not found. | SignpostMarv | 2012-10-29 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Changing the logic order in the TaskInventory iterator of ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. | ||||
| | * | | | Replacing double-if block in SceneObjectPart.SendSound with Util.Clip | SignpostMarv | 2012-10-29 | 1 | -4/+1 |
| | | | | | |||||
| | * | | | Fix memory leak where removing an NPC did not remove its circuits. | Justin Clark-Casey (justincc) | 2012-10-29 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address. | ||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-29 | 1 | -2/+5 |
| | |\ \ \ | |||||
| | * | | | | Add "force gc" region console command which manually invokes garbage collection. | Justin Clark-Casey (justincc) | 2012-10-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | For debugging purposes. | ||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-28 | 1 | -3/+17 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | ||||
| | * | | | | Add a property to determine if a link set is stored in the database. Also, fix | Melanie | 2012-10-28 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | a bug where "Force object permissive" god action would fail to reset child prim permissions. | ||||
| | * | | | | Deep copy the collection of at_target objects so it can't be modified while | Melanie | 2012-10-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | it's being iterated | ||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-10-19 | 1 | -3/+4 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | extend coment to include all unused SOG CheckSculptAndLoad() | UbitUmarov | 2012-10-18 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-28 | 1 | -1/+4 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | | Deep copy the collection of at_target objects so it can't be modified while | Melanie | 2012-10-28 | 1 | -2/+5 |
| | | |_|/ | |/| | | | | | | | | | | it's being iterated | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 2 | -4/+6 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | Separate LSL's notion of the default anim from the actually playing anims. | Melanie | 2012-10-26 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when ↵ | Melanie | 2012-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | any AO hud is" This reverts commit fa484c3494a7190b4d7526094347be74d091e125. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 6 | -29/+107 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | ||||
| | * | | | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵ | Justin Clark-Casey (justincc) | 2012-10-26 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | since the call itself does nothing and the return value is ignored by all callers. This is a very old method (+4 years) so is probably confusing code cruft. | ||||
| | * | | | minor: if a scene is already shutting down on Scene.Close(), warn and exit ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | instead of attempting to run another shutdown concurrently. Thanks to Oren Hurvitz for this change. | ||||
| | * | | | Changed "course" to "coarse" in several places | Oren Hurvitz | 2012-10-25 | 1 | -7/+7 |
| | | | | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-25 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO ↵ | nebadon | 2012-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hud is loaded. Thank you tglion | ||||
| | * | | | | In Scene.Close(), dispose of the physics scene after base.Close() since ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 2 | -6/+25 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script events can still access Physics scene until the script engine shuts down (triggered off base.Close()) XEngine listeners to EventManager.OnShutdown which is triggered from base.Close(). Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene. This bug has existed since c150320 (Thu Jul 26 15:27:18 2012) and was in 0.7.4 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |