| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-06-15 | 3 | -94/+588 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Reapply the one change that was in the revert that was actually function, not | Melanie | 2012-06-15 | 1 | -1/+1 |
| | | | | | | | | | form | ||||
| | * | Revert changes... | UbitUmarov | 2012-06-15 | 2 | -76/+37 |
| | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1. | ||||
| | * | SL doesn't let scripts rotate root part of physical linksets also fix ↵ | UbitUmarov | 2012-06-15 | 1 | -16/+27 |
| | | | | | | | | | sitting avatars rotations broken in previus commit, forcing send of updates. | ||||
| | * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of ↵ | UbitUmarov | 2012-06-15 | 1 | -3/+21 |
| | | | | | | | | | asking physics engines all the time. Some engines delays may make them give wrong answers. | ||||
| | * | only rotation of root part change parts positions, so only call ↵ | UbitUmarov | 2012-06-15 | 1 | -21/+31 |
| | | | | | | | | | ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics' | ||||
| | * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-13 | 1 | -3/+11 |
| | |\ | |||||
| | | * | Add detecting non-physical phantoms back into raycast | Melanie | 2012-06-13 | 1 | -3/+11 |
| | | | | |||||
| | * | | Changed t adding the avatar dependent sit offset and not subtracting, so ↵ | UbitUmarov | 2012-06-13 | 2 | -27/+46 |
| | | | | | | | | | | | | | not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails() | ||||
| | * | | convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in ↵ | UbitUmarov | 2012-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | SitTarget. Something seems to be doing that before this gets called, but just in case... | ||||
| | * | | Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus ↵ | UbitUmarov | 2012-06-13 | 1 | -9/+23 |
| | | | | | | | | | | | | | 'cosmetics' and added some parts costs information. | ||||
| | * | | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. ↵ | UbitUmarov | 2012-06-13 | 2 | -10/+19 |
| | | | | | | | | | | | | | Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams. | ||||
| | * | | try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other ↵ | UbitUmarov | 2012-06-12 | 1 | -3/+10 |
| | | | | | | | | | | | | | cases | ||||
| | * | | fix the try.. finally in SetPrimitiveParams i did mess and add one for the ↵ | UbitUmarov | 2012-06-12 | 1 | -188/+156 |
| | | | | | | | | | | | | | avatars case, so to optimize a bit 'warp' scripts. | ||||
| | * | | more changes to Get and Get primitiveparams: Let Get remove avatarheight ↵ | UbitUmarov | 2012-06-12 | 1 | -26/+94 |
| | | | | | | | | | | | | | adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code... | ||||
| | * | | Moved auxiliar funtions of last commit from sop to lsl api since they are ↵ | UbitUmarov | 2012-06-12 | 2 | -39/+22 |
| | | | | | | | | | | | | | only used on one place each | ||||
| | * | | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ↵ | UbitUmarov | 2012-06-12 | 2 | -3/+272 |
| | | | | | | | | | | | | | code in SOP.cs | ||||
| | * | | change object drag so it applies a impulse and not a push force so it works ↵ | UbitUmarov | 2012-06-11 | 1 | -2/+6 |
| | | | | | | | | | | | | | as before my fix to impulse/forces | ||||
| | * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-06-11 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-06-08 | 83 | -16547/+18630 |
| | | |\ \ | |||||
| | * | \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-11 | 4 | -7/+80 |
| | |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | | *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending ↵ | UbitUmarov | 2012-06-08 | 1 | -7/+37 |
| | | | | | | | | | | | | | | | | | position change on others; don't assume m_host is in same grp that part (possible always is)... | ||||
| | * | | | *UNTESTED* let SetPrimParams for avatars parse even unsupported parameters ↵ | UbitUmarov | 2012-06-08 | 1 | -2/+84 |
| | | | | | | | | | | | | | | | | | so that if a supported one is in the middle of then it still works. | ||||
| | * | | | *UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for ↵ | UbitUmarov | 2012-06-08 | 1 | -6/+46 |
| | | | | | | | | | | | | | | | | | avatars. Stopped setting position twice in normal SetPrimParams | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 9 | -148/+250 |
| |\ \ \ \ | |||||
| | * | | | | Make the "debug http" command available for robust as well as the simulator. ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 6 | -110/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures. | ||||
| | * | | | | Add main instance to internal MainServer.m_Servers list to simplify internal ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 5 | -22/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance | ||||
| | * | | | | minor: Tell user the current debug http level if "debug http" console ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | command is executed without a level parameter | ||||
| | * | | | | When setting debug http level, do this for all known http servers, not just ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 3 | -22/+41 |
| | | | | | | | | | | | | | | | | | | | | | the main instance. | ||||
| | * | | | | Make XMLRPCModule use an existing HTTP server if one already exists on the ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | desired port. | ||||
| | * | | | | Get rid of some unnecessary null checks in ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 2 | -13/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RegionApplicationBase.StartupSpecific() - a constructor can never return null. Also adds some method doc to MainServer | ||||
| | * | | | | minor: Extend 'debug http' usage statement to 0..3 from 0..2 | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 2 | -12/+32 |
| | | | | | | | | | | | | | | | | | | | | | warn to be logged if we receive invalid xml for xmlrpc. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 2 | -1/+15 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| | * | | | | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Accidentally make responseString null by default instead of String.Empty. It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!) | ||||
| | * | | | | Fix very recent regression in 917d753 where I put the ++updatesThisCall ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside the batching part of ProcessEntityUpdates() This stopped any batching happening and since this method is called periodically updates were sent very slowly | ||||
| | * | | | | If we're going to discard a terse update block because it's now someone ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | else's hud, then don't still add it to the list of blocks for the update message. | ||||
| | * | | | | correct wrong incomplete comment from previous commit 3c3ea19 in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | AttachmentsModule | ||||
| | * | | | | Fix a bug where scene objects attached as HUDs through scripts would not ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disappear for other avatars. We do this by sending a kill message for that object to all other avatars apart from the one that has the hud. | ||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -4/+29 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix a race condition where an object update for a hud could be sent to ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-owner avatars if the hud was attached directly from within the region. If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that. This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud. | ||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-14 | 1 | -4/+29 |
| | |/ / / / | | | | | | | | | | | | | | | | up the sound pipeline in the viewer. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 4 | -8/+21 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 3 | -7/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center) | ||||
| | * | | | | minor: remove unnecessary IsAttachment = false setting for new object in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | UploadObjectAssetModule, property always starts as false | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 9 | -24/+60 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | duplicate code | ||||
| | * | | | | Remove long obsolete and unused IClientAPI.KillEndDone() | Justin Clark-Casey (justincc) | 2012-06-13 | 5 | -19/+0 |
| | | | | | | |||||
| | * | | | | Add ObjectUpdate as one of the packets that can be screened out when setting ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | debug packet level | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |