| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 2 | -21/+66 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-25 | 2 | -8/+51 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | | |\ | |||||
| | | | * | Telehub map items displayed | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | | | | | |||||
| | | * | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵ | Dan Lake | 2012-01-24 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate | ||||
| | * | | | Change the WorldMapModule to use SOG rather than SOP for the telehub ans | Melanie | 2012-01-25 | 1 | -13/+15 |
| | |/ / | | | | | | | | | | cover a potential nullref | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 10 | -169/+185 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | | Make errors reported by OpenSim when it halts because it can't find certain ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 3 | -20/+12 |
| | | | | | | | | | | | | | config sections or files a bit more user friendly. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -0/+18 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-01-24 | 1 | -0/+18 |
| | | |\ | |||||
| | | | * | Put Telehubs on the map | BlueWall | 2012-01-24 | 1 | -0/+18 |
| | | | | | |||||
| | * | | | Comment out asset statistics section from periodic stats as these have not ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -108/+109 |
| | |/ / | | | | | | | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status"). | ||||
| | * | | Fix "Abnormal client thread terminations" stat in period CONNECTION ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | STATISTICS to count the number of times clients are disconnected due to ack timeouts. This has been broken for a long period and would only ever show 0. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -13/+0 |
| | |\ \ | |||||
| | | * | | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵ | Dan Lake | 2012-01-24 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | OnObjectDuplicate | ||||
| | * | | | Comment out inventory statistics section from periodic stats, since this ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -14/+15 |
| | |/ / | | | | | | | | | | only contained the now uncollected and irrelevant inventory cache number. | ||||
| | * | | minor: correct text and usage for "image queues show" reigon console command. | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-01-24 | 13 | -9/+481 |
| | |\ \ | | |/ | |||||
| | * | | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 2 | -12/+27 |
| | | | | | | | | | | | | | error log lines. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Teleport routing, part 1 | Melanie | 2012-01-24 | 1 | -0/+53 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 3 | -59/+31 |
| | | | | | | | | | | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| * | | | | Add handling bans properly | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add teleport routing, first part | Melanie | 2012-01-24 | 1 | -0/+59 |
| |/ / / | |||||
| * | | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 3 | -59/+31 |
| | | | | | | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 2 | -4/+4 |
| | | | | |||||
| * | | | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 2 | -3/+3 |
| | | | | |||||
| * | | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 2 | -3/+3 |
| | | | | |||||
| * | | | Correct some SQL syntax | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix merge artefacts and build break | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Add a forgotten parameter | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-24 | 5 | -208/+146 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs | ||||
| | * | | Change Telehubs to store only the data that is really needed and not | Melanie | 2012-01-24 | 4 | -194/+123 |
| | | | | | | | | | | | | | additional redundant information. | ||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-23 | 1 | -4/+11 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of /home/opensim/var/repo/opensim into telehub | BlueWall | 2012-01-23 | 2 | -2/+5 |
| | | |\ \ | |||||
| | | * | | | Add update to Telehub position and rotation before adding SpawnPoints | BlueWall | 2012-01-23 | 1 | -4/+11 |
| | | | | | | |||||
| | * | | | | IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the | Melanie | 2012-01-23 | 1 | -12/+3 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | Telehub commits! They will eat your babies and corrupt your database while they munch. DO NOT use anything from the first Telehub commit to this one. FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned. | ||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-23 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'telehub' | BlueWall | 2012-01-23 | 1 | -53/+55 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Cleanup | BlueWall | 2012-01-23 | 1 | -3/+6 |
| | | | | | | |||||
| | | * | | | Cleanup unused parts, add some error handling | BlueWall | 2012-01-23 | 1 | -53/+52 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-01-23 | 3 | -48/+44 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-23 | 3 | -48/+44 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| | | * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-22 | 1 | -0/+3 |
| | | |\ \ \ \ | | | |/ / / | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |