| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix test failure | Melanie | 2012-02-03 | 1 | -0/+1 |
| | | | |||||
| | * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 16 | -108/+197 |
| | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | OpenID: server connector had a copy-and-paste error that made identity ↵ | Diva Canto | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | queries fail. | ||||
| * | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 15 | -109/+188 |
| | | | |||||
| * | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 2 | -186/+42 |
| | | | |||||
| * | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 |
| | | | |||||
| * | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 3 | -50/+81 |
| | | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 1 | -3/+3 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -14/+28 |
| | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | ||||
| * | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -15/+28 |
| | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | ||||
| * | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 7 | -43/+305 |
| |\ \ | |/ | | | | | | | 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 | 4 | -25/+279 |
| | |\ | |||||
| | | * | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵ | Diva Canto | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | Uri.ToString() drops the port when it's port 80. | ||||
| | | * | Lay out script status in property per row format, since getting too long for ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -6/+12 |
| | | | | | | | | | | | | | console lines. | ||||
| | | * | Add count of events queued for a particular script in "scripts show" console ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+9 |
| | | | | | | | | | | | | | command | ||||
| | | * | Make script console commands only show for selected region. | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -0/+9 |
| | | | | |||||
| | | * | Implement "xengine status" console command to show various xengine stats | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+28 |
| | | | | |||||
| | | * | Add "show part uuid" and "show part name" console commands. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -7/+97 |
| | | | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts. | ||||
| | | * | Implement "show object name <name>" console command to show details of an ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -8/+49 |
| | | | | | | | | | | | | | object with the given name | ||||
| | | * | Get rid of the "no objects found" feedback for now - this doesn't work well ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -11/+13 |
| | | | | | | | | | | | | | if a command is executed over multiple scenes. | ||||
| | | * | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 2 | -5/+62 |
| | | | | | | | | | | | | | This will show details about a part with the given uuid if it's found. | ||||
| | | * | Add more user feedback if an object isn't found for which delete was requested. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+15 |
| | | | | |||||
| | | * | Add the name of a deleted object to the console output | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | | | | |||||
| | | * | If a particular region is selected in the console, only try to delete ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -16/+21 |
| | | | | | | | | | | | | | | | | | | | objects in that region, rather than in every region on the simulator The old wrong behaviour was in place before the command was extracted to a module. | ||||
| | * | | Fix copy/paste errors | Melanie | 2012-02-01 | 2 | -3/+3 |
| | | | | |||||
| | * | | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 |
| | | | | |||||
| | * | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 2 | -12/+19 |
| | |/ | | | | | | | | | 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 | 4 | -107/+208 |
| |\ \ | |/ | |||||
| | * | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 2 | -104/+206 |
| | | | | | | | | | for adding similar show commands. | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -2/+1 |
| | | | |||||
| | * | Use Environment.TickCount & Int32.MaxValue; instead of ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-31 | 1 | -11/+37 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * | | Draw brders around parcels for sale | Melanie | 2012-01-31 | 1 | -11/+37 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 5 | -4/+150 |
| |\ \ \ | |/ / |/| / | |/ | | | 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 | 3 | -0/+134 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Fix:llSetText - limited text to a maximum of 254 chars | PixelTomsen | 2012-01-31 | 1 | -3/+3 |
| | | | | | | | | | | | | | mantis: http://opensimulator.org/mantis/view.php?id=5867 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 2 | -7/+87 |
| | | | |||||
| * | | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 2 | -7/+87 |
| | | | |||||
| * | | Comment debug spam | Melanie | 2012-01-30 | 1 | -3/+3 |
| | | | |||||
| * | | Fix displaying landmark and search info properly with long names | Melanie | 2012-01-30 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -5/+7 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-30 | 1 | -5/+7 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-30 | 3 | -20/+46 |
| | | |\ | |||||
| | | * | | 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. | ||||
| | | * | | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID" | BlueWall | 2012-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00d1c88c59c10aa8d34fa36910cf0f1f0e9878b8. Need to dig a little deeper to see exactly how V1 viewers are using this | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |