aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * 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-141-34/+30
|\ \ | |/ | | | | | | | | | | | | 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
| * 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).
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+7
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-6/+6
| | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+1
| | | | | | | | rather than halting the IAR load with an exception.
* | Remove ViewObjectInventory method unsupported by coreMelanie2012-01-121-17/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-01-101-2/+0
| |\
| * | HG landing points: this hopefully fixes some confusion that was making HG ↵Diva Canto2012-01-101-5/+6
| | | | | | | | | | | | avies always land in 0,0
* | | Merge branch 'master' into careminsterMelanie2012-01-102-19/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Teleport DebuggingBlueWall2012-01-101-2/+0
| |/ | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport
| * Add some run-time debugging supportBlueWall2012-01-092-1/+6
| | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
| * Use our TeleportFlagsBlueWall2012-01-092-22/+30
| | | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.