aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-06-110-0/+0
| |\ \ \
| | * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-06-0883-16547/+18630
| | |\ \ \
| * | \ \ \ 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-159-148/+250
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-156-110/+92
| * | | | 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 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-140-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-141-4/+29
| |/ / / /
* | | | | 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-149-24/+60
|\ \ \ \ \ | |/ / / /
| * | | | 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
| * | | | In the osGetGrid functions, if the [GridInfo] section does not exist then ret...Justin Clark-Casey (justincc)2012-06-131-1/+6
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-132-100/+349
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-06-131-0/+4
| | |\ \ \ \
| | | * | | | Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.BlueWall2012-06-121-0/+4
| | * | | | | Committing the Avination implementation of llCastRay. This is a complete rewriteMelanie2012-06-131-100/+345
| | |/ / / /
| * | | | | Add "deregister region" by uuid command to grid service to allow manual dereg...Justin Clark-Casey (justincc)2012-06-131-0/+45
| |/ / / /
* | | | | Merge branch 'master' into careminsterMelanie2012-06-138-317/+175
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-131-1/+6
| |\ \ \ \
| | * | | | Add variable timer configureation for the timer_ScriptBlueWall2012-06-121-1/+6
| * | | | | Don't include time to transmit response back to requester when assessing slow...Justin Clark-Casey (justincc)2012-06-137-317/+169
| |/ / / /
* | | | | Merge branch 'master' into careminsterMelanie2012-06-1210-98/+97
|\ \ \ \ \ | |/ / / /
| * | | | Remove accidental timeout left in during earlier debugging. Has been in sinc...Justin Clark-Casey (justincc)2012-06-121-1/+1
| * | | | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-126-70/+43
| * | | | Set IClientAPI.IsActive = false early on client removal due to ack timeout ra...Justin Clark-Casey (justincc)2012-06-122-35/+38
| * | | | If the simulator closes a root agent due to ack timeout, then send the client...Justin Clark-Casey (justincc)2012-06-121-2/+20
| * | | | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-124-24/+22
* | | | | Merge branch 'master' into careminsterMelanie2012-06-113-7/+15
|\ \ \ \ \ | |/ / / /
| * | | | Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6