aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-013-7/+23
|\ | | | | | | | | 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-012-3/+3
| | |
| * | 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-281-1/+33
|\ \ | |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-281-1/+33
| | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon
* | Merge branch 'master' into careminsterMelanie2012-01-271-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-271-0/+30
| |\
| * | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ↵Justin Clark-Casey (justincc)2012-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
* | | 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.
| * refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), ↵Justin Clark-Casey (justincc)2012-01-251-79/+95
| | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim()
* | Merge branch 'master' into careminsterMelanie2012-01-251-6/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵Dan Lake2012-01-241-6/+0
| | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate
* | Merge branch 'master' into careminsterMelanie2012-01-251-12/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵Dan Lake2012-01-241-13/+0
| | | | | | | | OnObjectDuplicate
| * Teleport routing, part 1Melanie2012-01-241-0/+53
| |
* | Add handling bans properlyMelanie2012-01-241-1/+1
| |
* | Add teleport routing, first partMelanie2012-01-241-0/+59
| |
* | Merge branch 'master' into careminsterMelanie2012-01-161-1/+1
|\ \ | |/
| * Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | | | adjustment commit. Left in the method doc.
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Fix mergeMelanie2012-01-141-5/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-143-34/+81
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-141-0/+13
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-132-45/+30
| | | | | | | | | | rotating physical objects. This does not use physics. Currently the rate of change is determined as 1 / (PI * Strength).
| * Update RegionReadyModuleBlueWall2012-01-131-0/+38
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-131-3/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-121-3/+0
| | | | | | | | Move some added fuctions out of core into the addon module to keep things clean
* | Merge branch 'master' into careminsterMelanie2012-01-132-0/+73
|\ \ | |/