| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-23 | 1 | -0/+7 | |
| |\ \ | |/ | ||||||
| | * | Fix regression where we stopped closing scenes on simulator exit. | Justin Clark-Casey (justincc) | 2012-11-23 | 1 | -0/+7 | |
| | | | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000) | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-20 | 1 | -3/+20 | |
| |\ \ | |/ | ||||||
| | * | Minor formatting for 0962a35d and a few one-line comments as to why that ↵ | Justin Clark-Casey (justincc) | 2012-11-20 | 1 | -8/+7 | |
| | | | | | | | | | code is there | |||||
| | * | Fix movetotarget on mega regions. | Iain Oliver | 2012-11-20 | 1 | -3/+21 | |
| | | | ||||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 3 | -5/+28 | |
| |\ \ | ||||||
| | * \ | Merge branch 'ubitwork' into avination | Melanie | 2012-11-06 | 1 | -5/+10 | |
| | |\ \ | ||||||
| | | * | | actually remove the use of random on persist timmings | UbitUmarov | 2012-11-02 | 1 | -4/+6 | |
| | | | | | ||||||
| | | * | | Create a new random when needed using normal time based seed instead of | UbitUmarov | 2012-11-02 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | reusing a shared one than may not be valid | |||||
| | | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-30 | 5 | -16/+55 | |
| | | |\ \ | ||||||
| | * | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 2 | -0/+18 | |
| | | | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 3 | -97/+12 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | |||||
| | * | | | | Stop closing old style modules | Melanie | 2012-11-12 | 1 | -9/+0 | |
| | | | | | | ||||||
| | * | | | | Remove the old style module loader and all references to it | Melanie | 2012-11-12 | 3 | -88/+12 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 2 | -35/+70 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||||
| | * | | | | Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() ↵ | Justin Clark-Casey (justincc) | 2012-11-10 | 2 | -35/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make it compile again Not currently in test suite since not yet working. Also add method doc to Scene.DeRezObjects() | |||||
| * | | | | | 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 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |