| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-30 | 4 | -8/+15 |
| |\ | |||||
| | * | Return world rotation on llGetObjectDetails()'s OBJECT_ROT | Melanie | 2012-07-29 | 1 | -4/+10 |
| | | | |||||
| | * | Fix an exception while outputting a log message | Melanie | 2012-07-29 | 1 | -1/+1 |
| | | | |||||
| | * | When controls are released by script, don't drop the permission to | Melanie | 2012-07-29 | 1 | -2/+0 |
| | | | | | | | | | retake them. | ||||
| | * | See that if controls are taken, those are released before taking new ones | Melanie | 2012-07-29 | 1 | -0/+3 |
| | | | |||||
| | * | Bump number of URLs to 15000 per region | Melanie | 2012-07-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-28 | 8 | -44/+139 |
| |\ \ | |/ | |||||
| | * | Implement the linefeed URL hack for ShoutCast and other services | Melanie | 2012-07-27 | 1 | -0/+53 |
| | | | |||||
| | * | Change the stair fudge factor so steps of 0.5m can be climbled to match ↵ | Melanie | 2012-07-27 | 1 | -2/+2 |
| | | | | | | | | | inworldz claims and SL's realities | ||||
| | * | Allow load and save of IAR without a password. The password must still be | Melanie | 2012-07-24 | 1 | -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 per | Melanie | 2012-07-23 | 5 | -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 ubitwork | ubit | 2012-07-23 | 6 | -16/+27 |
| |\ \ | |/ | |||||
| | * | Fix double-ping on logout by not sending a stop packet to the client | Melanie | 2012-07-21 | 1 | -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 serialized | Melanie | 2012-07-20 | 1 | -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 avination | Melanie | 2012-07-19 | 2 | -144/+184 |
| | |\ | |||||
| | * | | Fix slow loading of task inventory | Melanie | 2012-07-19 | 4 | -9/+16 |
| | | | | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-19 | 3 | -154/+221 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Update ubitMesh primMesher with new Dahlia version on core ( reckick git | UbitUmarov | 2012-07-19 | 2 | -144/+183 |
| | | | | | | | | | | | | | back) | ||||
| | * | | kick git | UbitUmarov | 2012-07-19 | 1 | -0/+1 |
| | |/ | |||||
| | * | Fix llSameGroup to work according to specs | Melanie | 2012-07-18 | 1 | -10/+36 |
| | | | |||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-07-17 | 10 | -447/+346 |
| | |\ | |||||
| | * | | Replace PollServiceRequestManager with older version, add extra logging to | Melanie | 2012-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | event exceptions to see call path leading up to it. | ||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 3 | -50/+69 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | minor changes, removed extra parts physics updates on linking nonroot | UbitUmarov | 2012-07-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | prims | ||||
| | * | | fix our stats ( old schema ) | UbitUmarov | 2012-07-17 | 2 | -48/+66 |
| | | | | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 3 | -10/+4 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 3 | -10/+4 |
| | |\ \ | | |/ | |||||
| | | * | Fix merge artefacts | Melanie | 2012-07-17 | 3 | -10/+4 |
| | | | | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 7 | -83/+13 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 7 | -83/+13 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 7 | -83/+13 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-07-16 | 1 | -30/+13 |
| | | | |\ | |||||
| | | | | * | refactor: factor out common code in WebStatsModule.OnMakeRootAgent() | Justin Clark-Casey (justincc) | 2012-07-16 | 1 | -8/+7 |
| | | | | | | |||||
| | | | | * | In WebStatsModule.OnMakeRootAgent(), get region ID directly from ↵ | Justin Clark-Casey (justincc) | 2012-07-16 | 1 | -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-16 | 1 | -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" | Melanie | 2012-07-16 | 6 | -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 ubitwork | ubit | 2012-07-17 | 214 | -5856/+12578 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 214 | -5856/+12578 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 12 | -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 careminster | Melanie | 2012-07-16 | 1 | -1/+14 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | sending more user-friendly messages to the script error window rather than ↵ | SignpostMarv | 2012-07-16 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | | * | | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 3 | -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 ↵ | dahlia | 2012-07-13 | 1 | -143/+183 |
| | | | | | | | | | | | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085 | ||||
| | | | * | | acting on feedback from justincc | SignpostMarv | 2012-07-14 | 1 | -6/+7 |
| | | | | | | |||||
| | | | * | | acting on feedback from justincc | SignpostMarv | 2012-07-14 | 1 | -39/+42 |
| | | | | | | |||||
| | | | * | | added in some extra variables, it sometimes thinks it is on the same parcel :( | SignpostMarv | 2012-07-14 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
| | | | * | | adding workaround for silent failure if position is outside the bounds of a ↵ | SignpostMarv | 2012-07-14 | 1 | -13/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region, implementing parcel prim count check. Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
| | | | * | | Implementation of llSetRegionPos(). Does not implement failure on object ↵ | SignpostMarv | 2012-07-14 | 3 | -4/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name> | ||||
| | | | * | | When generating a Warp3D texture, set the detailTexture[i] variable on ↵ | Justin Clark-Casey (justincc) | 2012-07-14 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resize from the JPEG2000 original rather than only saving it to disk. This appears to be the cause of the warp 3d exception seen when starting a new region for the first time. Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk. Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272 | ||||
| | | * | | | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 11 | -116/+99 |
| | | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |