aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Spin off starting scripts in rezzed objects into a thread to avoid a recursionMelanie2012-01-251-1/+4
* | | | Merge branch 'master' into careminsterMelanie2012-01-252-21/+66
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-252-8/+51
| |\ \ \
| | * \ \ Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-3/+51
| | |\ \ \
| | | * | | Telehub map items displayedBlueWall2012-01-241-3/+51
| | * | | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreate...Dan Lake2012-01-241-6/+0
| | | |/ / | | |/| |
| * | | | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-01-2510-169/+185
|\ \ \ \ | |/ / /
| * | | Make errors reported by OpenSim when it halts because it can't find certain c...Justin Clark-Casey (justincc)2012-01-243-20/+12
| * | | 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 be...Justin Clark-Casey (justincc)2012-01-241-108/+109
| |/ / /
| * | | Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTIC...Justin Clark-Casey (justincc)2012-01-241-0/+1
| * | | 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, OnObject...Dan Lake2012-01-241-13/+0
| * | | | Comment out inventory statistics section from periodic stats, since this only...Justin Clark-Casey (justincc)2012-01-241-14/+15
| |/ / /
| * | | 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-2413-9/+481
| |\ \ \ | | |/ /
| * | | Restrict accessible of ODECharacter Shell and Body. Add method doc and some ...Justin Clark-Casey (justincc)2012-01-242-12/+27
* | | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Teleport routing, part 1Melanie2012-01-241-0/+53
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-240-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-243-59/+31
* | | | | 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
* | | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ \ | |/ / /
| * | | Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
* | | | Reverse the spawn point distance vectorMelanie2012-01-242-4/+4
* | | | Merge branch 'master' into careminsterMelanie2012-01-240-0/+0
|\ \ \ \ | |/ / /
| * | | Correct a coordinate to make the viewer like itMelanie2012-01-242-3/+3
* | | | 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-240-0/+0
|\ \ \ \ | |/ / /
| * | | Add a forgotten parameterMelanie2012-01-241-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-01-245-208/+146
|\ \ \ \ | |/ / /
| * | | Change Telehubs to store only the data that is really needed and notMelanie2012-01-244-194/+123
| * | | 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-232-2/+5
| | |\ \ \
| | * | | | 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
| | |/ / / | |/| | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-231-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'telehub'BlueWall2012-01-231-53/+55
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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-233-48/+44
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-233-48/+44
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |