aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-2510-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-243-20/+12
| | | | | | | | config sections or files a bit more user friendly.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-241-0/+18
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-0/+18
| | |\
| | | * Put Telehubs on the mapBlueWall2012-01-241-0/+18
| | | |
| * | | Comment out asset statistics section from periodic stats as these have not ↵Justin Clark-Casey (justincc)2012-01-241-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-241-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/opensimJustin Clark-Casey (justincc)2012-01-241-13/+0
| |\ \
| | * | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵Dan Lake2012-01-241-13/+0
| | | | | | | | | | | | | | | | OnObjectDuplicate
| * | | Comment out inventory statistics section from periodic stats, since this ↵Justin Clark-Casey (justincc)2012-01-241-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-241-2/+2
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-2412-9/+478
| |\ \ | | |/
| | * Teleport routing, part 1Melanie2012-01-241-0/+53
| | |
| | * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
| | | | | | | | | | | | spwan point positioning on rotated telehubs.
| | * Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
| | |
| | * Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
| | |
| | * Add a forgotten parameterMelanie2012-01-241-1/+1
| | |
| * | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ↵Justin Clark-Casey (justincc)2012-01-242-12/+27
| | | | | | | | | | | | error log lines.
* | | Add handling bans properlyMelanie2012-01-241-1/+1
| | |
* | | Add teleport routing, first partMelanie2012-01-241-0/+59
| | |
* | | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
| | | | | | | | | | | | spwan point positioning on rotated telehubs.
* | | Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
| | |
* | | Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
| | |
* | | Correct some SQL syntaxMelanie2012-01-241-1/+1
| | |
* | | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-245-208/+146
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * | Change Telehubs to store only the data that is really needed and notMelanie2012-01-244-194/+123
| | | | | | | | | | | | additional redundant information.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-231-4/+11
| |\ \
| | * \ Merge branch 'master' of /home/opensim/var/repo/opensim into telehubBlueWall2012-01-231-2/+2
| | |\ \
| | * | | Add update to Telehub position and rotation before adding SpawnPointsBlueWall2012-01-231-4/+11
| | | | |
| * | | | IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since theMelanie2012-01-231-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/opensimBlueWall2012-01-231-2/+2
| |\ \ \ | | |/ / | |/| |
| * | | Cleanup BlueWall2012-01-231-3/+6
| | | |
| * | | Cleanup unused parts, add some error handlingBlueWall2012-01-231-53/+52
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-232-48/+41
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-01-232-48/+41
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | Fix up some parameter namingMelanie2012-01-221-2/+2
| | |/ /
| | * | Finish connecting Telehub to databaseBlueWall2012-01-222-47/+25
| | | |
| | * | Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
| | | |
* | | | Fix llLookAt the right wayMelanie2012-01-231-19/+24
|/ / /
* | | Merge branch 'master' into careminsterMelanie2012-01-227-73/+350
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * | Change the key name I missed in last commitMelanie2012-01-221-1/+1
| | |
| * | Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-228-267/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * | Telehub Support:BlueWall2012-01-216-71/+341
| | | | | | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | | Merge branch 'master' into careminsterMelanie2012-01-2120-46/+754
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-204-33/+149
| |\ \ | | |/
| | * Allow a viewer UDP image request retry to trigger another asset fetch if an ↵Justin Clark-Casey (justincc)2012-01-192-6/+32
| | | | | | | | | | | | | | | | | | existing fetch hasn't responded before a timeout. This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
| | * Add image not in database test for LLImageManagerJustin Clark-Casey (justincc)2012-01-194-13/+58
| | |
| | * refactor: separate out common parts of LLImageManagerTestsJustin Clark-Casey (justincc)2012-01-191-48/+40
| | |
| | * Add LLImageManager regression test for discard caseJustin Clark-Casey (justincc)2012-01-191-0/+53
| | |
generated by cgit v1.1 at 2024-11-19 14:46:18 +0000