aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)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 ↵Melanie2012-07-311-3/+9
| |/ | | | | | | render according to their camera position is beyond me.
* | 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
| | | | | | | | retake them.
| * 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 ↵Melanie2012-07-271-2/+2
| | | | | | | | inworldz claims and SL's realities
| * Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| | | | | | | | | | | | present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
| | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-236-16/+27
|\ \ | |/
| * Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | | | | | | | if the client told us it wants to log out in the first place.
| * Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
| * Merge branch 'ubitwork' into avinationMelanie2012-07-192-144/+184
| |\
| * | Fix slow loading of task inventoryMelanie2012-07-194-9/+16
| | |
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-193-154/+221
|\ \ \ | | |/ | |/|
| * | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-192-144/+183
| | | | | | | | | | | | back)
| * | kick gitUbitUmarov2012-07-191-0/+1
| |/
| * Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-07-1710-447/+346
| |\
| * | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-0/+1
| | | | | | | | | | | | event exceptions to see call path leading up to it.
* | | 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
| | | | | | | | | | | | prims
| * | 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 ↵Justin Clark-Casey (justincc)2012-07-161-18/+2
| | | | | | | | | | | | | | | | | | | | SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list.
| | | | * Stop warning about no session from ViewerStats if user teleports to another ↵Justin Clark-Casey (justincc)2012-07-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region in the same simulator that was not next to the source region. This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code. Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
| | | * | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-17214-5856/+12578
|\ \ \ \ | |/ / /
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-17214-5856/+12578
| |\ \ \ | | |/ /
| | * | Merge branch 'avination' into careminsterMelanie2012-07-1612-201/+201
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
| | |\ \ \ | | | | |/ | | | |/|
| | | * | sending more user-friendly messages to the script error window rather than ↵SignpostMarv2012-07-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com>
| | * | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵dahlia2012-07-131-143/+183
| | | | | | | | | | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| | | | |
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| | | | |
| | | * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name>