aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-155-10/+10
|\
| * Add region name to UseCircuitCode log messagesJustin Clark-Casey (justincc)2012-06-151-4/+4
| * Put all debug console commands into a single Debug section rather than scatte...Justin Clark-Casey (justincc)2012-06-154-6/+6
* | Merge branch 'avination' into careminsterMelanie2012-06-153-94/+588
|\ \
| * | Reapply the one change that was in the revert that was actually function, notMelanie2012-06-151-1/+1
| * | Revert changes...UbitUmarov2012-06-152-76/+37
| * | SL doesn't let scripts rotate root part of physical linksets also fix sittin...UbitUmarov2012-06-151-16/+27
| * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of as...UbitUmarov2012-06-151-3/+21
| * | only rotation of root part change parts positions, so only call ResetChildPr...UbitUmarov2012-06-151-21/+31
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-06-131-3/+11
| |\ \
| | * | Add detecting non-physical phantoms back into raycastMelanie2012-06-131-3/+11
| * | | Changed t adding the avatar dependent sit offset and not subtracting, so not...UbitUmarov2012-06-132-27/+46
| * | | convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in SitTar...UbitUmarov2012-06-131-1/+1
| * | | Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus 'cosmet...UbitUmarov2012-06-131-9/+23
| * | | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Ch...UbitUmarov2012-06-132-10/+19
| * | | try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other c...UbitUmarov2012-06-121-3/+10
| * | | fix the try.. finally in SetPrimitiveParams i did mess and add one for the av...UbitUmarov2012-06-121-188/+156
| * | | more changes to Get and Get primitiveparams: Let Get remove avatarheight adj...UbitUmarov2012-06-121-26/+94
| * | | Moved auxiliar funtions of last commit from sop to lsl api since they are on...UbitUmarov2012-06-122-39/+22
| * | | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ...UbitUmarov2012-06-122-3/+272
| * | | change object drag so it applies a impulse and not a push force so it works a...UbitUmarov2012-06-111-2/+6
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-06-114-7/+80
| |\ \ \ | | |/ /
| * | | *UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending pos...UbitUmarov2012-06-081-7/+37
| * | | *UNTESTED* let SetPrimParams for avatars parse even unsupported parameters so...UbitUmarov2012-06-081-2/+84
| * | | *UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for avata...UbitUmarov2012-06-081-6/+46
* | | | Merge branch 'master' into careminsterMelanie2012-06-158-148/+249
|\ \ \ \ | | |_|/ | |/| |
| * | | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-155-110/+91
| * | | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-155-22/+75
| * | | minor: Tell user the current debug http level if "debug http" console command...Justin Clark-Casey (justincc)2012-06-151-3/+11
| * | | When setting debug http level, do this for all known http servers, not just t...Justin Clark-Casey (justincc)2012-06-153-22/+41
| * | | Make XMLRPCModule use an existing HTTP server if one already exists on the de...Justin Clark-Casey (justincc)2012-06-151-4/+5
| * | | Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpeci...Justin Clark-Casey (justincc)2012-06-152-13/+32
| * | | minor: Extend 'debug http' usage statement to 0..3 from 0..2Justin Clark-Casey (justincc)2012-06-141-1/+1
| * | | Shuffle "debug http" levels so that 1 and 2 now cause different levels of war...Justin Clark-Casey (justincc)2012-06-142-12/+32
* | | | Merge branch 'master' into careminsterMelanie2012-06-152-1/+15
|\ \ \ \ | |/ / /
| * | | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
| * | | Fix very recent regression in 917d753 where I put the ++updatesThisCall outsi...Justin Clark-Casey (justincc)2012-06-141-2/+2
| * | | If we're going to discard a terse update block because it's now someone else'...Justin Clark-Casey (justincc)2012-06-141-2/+4
| * | | correct wrong incomplete comment from previous commit 3c3ea19 in AttachmentsM...Justin Clark-Casey (justincc)2012-06-141-1/+2
| * | | Fix a bug where scene objects attached as HUDs through scripts would not disa...Justin Clark-Casey (justincc)2012-06-141-0/+13
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-141-4/+29
| |\ \ \
| | * | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-141-4/+29
| * | | | Fix a race condition where an object update for a hud could be sent to non-ow...Justin Clark-Casey (justincc)2012-06-141-3/+24
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-06-144-8/+21
|\ \ \ \ | |/ / /
| * | | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p...Justin Clark-Casey (justincc)2012-06-143-7/+21
| * | | minor: remove unnecessary IsAttachment = false setting for new object in Uplo...Justin Clark-Casey (justincc)2012-06-141-1/+0
* | | | Merge branch 'master' into careminsterMelanie2012-06-148-24/+56
|\ \ \ \ | |/ / /
| * | | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica...Justin Clark-Casey (justincc)2012-06-131-5/+7
| * | | Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-135-19/+0
| * | | Add ObjectUpdate as one of the packets that can be screened out when setting ...Justin Clark-Casey (justincc)2012-06-131-1/+2