aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-073-14/+32
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-071-1/+25
| |
| * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | | | | | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
| * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-071-8/+4
| | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
* | Merge branch 'master' into careminsterMelanie2012-02-052-5/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Make configuration uniformBlueWall2012-02-051-3/+3
| | | | | | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
* | Merge branch 'master' into careminsterMelanie2012-02-045-88/+57
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵Justin Clark-Casey (justincc)2012-02-043-22/+21
| | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-031-8/+7
| |\
| | * Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵Dan Lake2012-02-031-4/+7
| | | | | | | | | | | | triggering events on a potentially null Scene
| * | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-74/+29
| | | | | | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
* | | Merge branch 'master' into careminsterMelanie2012-02-034-41/+98
|\ \ \ | |/ /
| * | Commenting out new event until I can fix OpenSim tests. Currently, testing ↵Dan Lake2012-02-021-6/+6
| | | | | | | | | | | | objects does not create a Scene or EventManager so triggering events crashes some tests
| * | OpenSim tests do not always create an EventManager so calls to trigger ↵Dan Lake2012-02-021-2/+6
| |/ | | | | | | events during tests must check for null EventManager
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-022-14/+17
| |\
| | * Improve reliability of script state saving by covering various savingMelanie2012-02-022-14/+17
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
| * | ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-022-20/+22
| | |
| * | Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵Dan Lake2012-02-012-10/+36
| | | | | | | | | | | | with region heartbeats
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0110-347/+575
| |\ \ | | |/
| * | Trigger event when prims are scheduled for an update. This gives modules ↵Dan Lake2012-01-192-0/+28
| | | | | | | | | | | | early access to changed parameters.
| * | Cleaned up Color and Text parameters in SOP and made LocalFlags public for ↵Dan Lake2012-01-191-20/+6
| | | | | | | | | | | | module access.
| * | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-192-1/+12
| | |
* | | Streamline banning code using existing methods.Melanie2012-02-021-3/+13
| | |
* | | Fix remembering attachment point and position when an item is rezzed in world.Melanie2012-02-021-1/+19
| | | | | | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root.
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-022-13/+16
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Merge branch 'master' into careminsterMelanie2012-02-012-6/+22
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| | |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-011-0/+6
| |\ \
| | * | Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-311-0/+6
| | | | | | | | | | | | | | | | This will show details about a part with the given uuid if it's found.
| * | | Fix copy/paste errorsMelanie2012-02-011-2/+2
| | | |
| * | | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-1/+11
| |/ / | | | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
* | | Merge branch 'master' into careminsterMelanie2012-01-311-104/+0
|\ \ \ | |/ /
| * | Move object delete commands into a commands region module, in preparation ↵Justin Clark-Casey (justincc)2012-01-311-104/+0
| | | | | | | | | | | | for adding similar show commands.
* | | Merge branch 'master' into careminsterMelanie2012-01-312-1/+20
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵Justin Clark-Casey (justincc)2012-01-311-1/+7
| | | | | | | | | | | | | | | | | | explicitly if there's an attempt to add any object with a zero UUID. Callers themselves need to check that they're not attempting to add a null scene object.
| * | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-312-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | scene objects. These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature. Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc. However, data can be inconsistent due to different machine circumstances and virtual machine actions. This area is under development.
* | | Comment debug spamMelanie2012-01-301-3/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-301-5/+7
|\ \ \ | |/ /
| * | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ↵Justin Clark-Casey (justincc)2012-01-301-5/+7
| | | | | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time.
* | | Merge branch 'master' into careminsterMelanie2012-01-284-11/+33
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵Justin Clark-Casey (justincc)2012-01-281-4/+12
| | | | | | | | | | | | texEntry) for region modules
| * | Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-282-5/+21
| | | | | | | | | | | | same grid don't have the publisher as owner.
| * | Comment out xfer section in Scene.UpdateTaskInventory() which was causing ↵Justin Clark-Casey (justincc)2012-01-281-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | spurious errors and "script saved" messages when script properties were changed. Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes. It's unknown whether the commented out code was working for very old viewers or not. Code is commented out to reduce complexity and so that useful error messages don't need to be removed. If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+27
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
| | | | | | | | | | | | spawn points
* | | Merge branch 'master' into careminsterMelanie2012-01-262-0/+87
|\ \ \ | |/ /
| * | Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-262-0/+87
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-262-89/+108
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵Justin Clark-Casey (justincc)2012-01-262-31/+34
| | | | | | | | | | | | | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity.
generated by cgit v1.1 at 2024-12-20 01:03:32 +0000