Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -3/+13 |
| | |||||
* | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 1 | -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 saving | Melanie | 2012-02-02 | 2 | -13/+16 |
| | | | | and loading scenarios which resulted in loss of continuity on item ids | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 2 | -6/+22 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Small optimization to last commit | Melanie | 2012-02-01 | 1 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 1 | -0/+6 |
| |\ | |||||
| | * | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+6 |
| | | | | | | | | | | | | This will show details about a part with the given uuid if it's found. | ||||
| * | | Fix copy/paste errors | Melanie | 2012-02-01 | 1 | -2/+2 |
| | | | |||||
| * | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -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 careminster | Melanie | 2012-01-31 | 1 | -104/+0 |
|\ \ | |/ | |||||
| * | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -104/+0 |
| | | | | | | | | for adding similar show commands. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 2 | -1/+20 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs | ||||
| * | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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-31 | 2 | -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 spam | Melanie | 2012-01-30 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -5/+7 |
|\ \ | |/ | |||||
| * | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ↵ | Justin Clark-Casey (justincc) | 2012-01-30 | 1 | -5/+7 |
| | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 4 | -11/+33 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵ | Justin Clark-Casey (justincc) | 2012-01-28 | 1 | -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-28 | 2 | -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-28 | 1 | -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 careminster | Melanie | 2012-01-26 | 1 | -0/+27 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Support rejecting a teleport if a user is banned in all parcels that have | Melanie | 2012-01-26 | 1 | -0/+30 |
| | | | | | | | | spawn points | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 2 | -0/+87 |
|\ \ | |/ | |||||
| * | Add basic TestAddScript() regression test | Justin Clark-Casey (justincc) | 2012-01-26 | 2 | -0/+87 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 2 | -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-26 | 2 | -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-25 | 1 | -79/+95 |
| | | | | | | | | RezNewScript() and rename one RezScript() to RezScriptFromPrim() | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -6/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵ | Dan Lake | 2012-01-24 | 1 | -6/+0 |
| | | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -12/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵ | Dan Lake | 2012-01-24 | 1 | -13/+0 |
| | | | | | | | | OnObjectDuplicate | ||||
| * | Teleport routing, part 1 | Melanie | 2012-01-24 | 1 | -0/+53 |
| | | |||||
* | | Add handling bans properly | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | |||||
* | | Add teleport routing, first part | Melanie | 2012-01-24 | 1 | -0/+59 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Comment out noisy log lines I accidentally included in the nant build target ↵ | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | adjustment commit. Left in the method doc. | ||||
| * | Remove monocov and other obsolete nant build targets. | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -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 merge | Melanie | 2012-01-14 | 1 | -5/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 1 | -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 incrementally | Mic Bowman | 2012-01-13 | 2 | -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 careminster | Melanie | 2012-01-12 | 2 | -7/+7 |
|\ \ | |/ | |||||
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵ | Diva Canto | 2012-01-12 | 2 | -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-11 | 1 | -1/+1 |
| | | | | | | | | rather than halting the IAR load with an exception. | ||||
* | | Remove ViewObjectInventory method unsupported by core | Melanie | 2012-01-12 | 1 | -17/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -5/+6 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-01-10 | 1 | -2/+0 |
| |\ | |||||
| * | | HG landing points: this hopefully fixes some confusion that was making HG ↵ | Diva Canto | 2012-01-10 | 1 | -5/+6 |
| | | | | | | | | | | | | avies always land in 0,0 | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 2 | -19/+32 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Teleport Debugging | BlueWall | 2012-01-10 | 1 | -2/+0 |
| |/ | | | | | | | | | | | Move setting from ini to existing facitilies - thanks justincc toggle with console command: debug teleport |