aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-012-4/+12
|\
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\
| | * Correct StandUp position and rotationMelanie2012-07-301-1/+3
| * | Reverse a senseless change in the prioritizer. Why I would want avatars to re...Melanie2012-07-311-3/+9
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-304-8/+15
|\ \ | |/
| * Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-4/+10
| * Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| * When controls are released by script, don't drop the permission toMelanie2012-07-291-2/+0
| * See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| * Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-288-44/+139
|\ \ | |/
| * Implement the linefeed URL hack for ShoutCast and other servicesMelanie2012-07-271-0/+53
| * Change the stair fudge factor so steps of 0.5m can be climbled to match inwor...Melanie2012-07-271-2/+2
| * Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-238-18/+29
|\ \ | |/
| * Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| * Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| * Merge branch 'ubitwork' into avinationMelanie2012-07-192-144/+184
| |\
| * | Fix slow loading of task inventoryMelanie2012-07-196-11/+18
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-194-161/+227
|\ \ \ | | |/ | |/|
| * | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-192-144/+183
| * | kick gitUbitUmarov2012-07-191-0/+1
| |/
| * Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
| * Merge branch 'ubitwork' into avinationMelanie2012-07-1711-457/+393
| |\
| * | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-172-7/+7
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-171-10/+47
|\ \ \ | | |/ | |/|
| * | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-50/+69
|\ \ \ | |/ /
| * | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| * | fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-10/+4
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ | | |/
| | * Fix merge artefactsMelanie2012-07-173-10/+4
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-177-83/+13
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \ | | |/
| | * Merge branch 'master' into careminsterMelanie2012-07-167-83/+13
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-07-161-30/+13
| | | |\
| | | | * refactor: factor out common code in WebStatsModule.OnMakeRootAgent()Justin Clark-Casey (justincc)2012-07-161-8/+7
| | | | * In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.Reg...Justin Clark-Casey (justincc)2012-07-161-18/+2
| | | | * Stop warning about no session from ViewerStats if user teleports to another r...Justin Clark-Casey (justincc)2012-07-161-6/+6
| | | * | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| | | |/
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-17353-8014/+16547
|\ \ \ \ | |/ / /
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-17353-8014/+16547
| |\ \ \ | | |/ /
| | * | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
| | |\ \
| | * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
| | |\ \ \ | | | | |/ | | | |/|
| | | * | sending more user-friendly messages to the script error window rather than th...SignpostMarv2012-07-161-1/+14
| | * | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
| | |\ \ \ | | | |/ /
| | | * | update PrimMesher.cs to dll version r72 which fixes some path errors in slice...dahlia2012-07-131-143/+183
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7