aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-1720-302/+478
|\
| * Merge branch 'avination' into careminsterMelanie2012-07-161-8/+63
| |\
| * \ Merge branch 'master' into careminsterMelanie2012-07-132-30/+3
| |\ \
| | * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-122-5/+2
| | * | Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-121-20/+1
| | * | Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.Re...Justin Clark-Casey (justincc)2012-07-121-5/+0
| * | | Merge branch 'avination' into careminsterMelanie2012-07-063-2/+11
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ...Justin Clark-Casey (justincc)2012-07-041-2/+2
| * | | | Merge branch 'master' into careminsterMelanie2012-06-291-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in...Justin Clark-Casey (justincc)2012-06-291-2/+1
| | * | | In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment...Justin Clark-Casey (justincc)2012-06-251-1/+32
| * | | | Merge branch 'master' into careminsterMelanie2012-06-152-5/+5
| |\ \ \ \ | | |/ / /
| | * | | 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-151-1/+1
| * | | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+10
| |\ \ \ \ | | |/ / /
| | * | | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-151-1/+10
| | * | | 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
| | * | | 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-141-1/+0
| |\ \ \ \ | | |/ / /
| | * | | 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-141-6/+3
| |\ \ \ \ | | |/ / /
| | * | | 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-131-4/+0
| | * | | Add ObjectUpdate as one of the packets that can be screened out when setting ...Justin Clark-Casey (justincc)2012-06-131-1/+2
| * | | | Merge branch 'master' into careminsterMelanie2012-06-122-7/+38
| |\ \ \ \ | | |/ / /
| | * | | Remove accidental timeout left in during earlier debugging. Has been in sinc...Justin Clark-Casey (justincc)2012-06-121-1/+1
| | * | | Set IClientAPI.IsActive = false early on client removal due to ack timeout ra...Justin Clark-Casey (justincc)2012-06-121-29/+35
| | * | | 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-121-2/+2
| * | | | Merge branch 'master' into careminsterMelanie2012-06-094-133/+133
| |\ \ \ \ | | |/ / /
| | * | | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a du...Justin Clark-Casey (justincc)2012-06-081-4/+0
| | * | | Instead of retrieving the known client again in LLUDPServer.RemoveClient(), c...Justin Clark-Casey (justincc)2012-06-081-21/+10
| | * | | If logging a client out due to ack timeout, do this asynchronously rather tha...Justin Clark-Casey (justincc)2012-06-082-10/+20
| | * | | Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-083-91/+103
| | * | | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet n...Justin Clark-Casey (justincc)2012-06-081-8/+1
| | * | | Store already retrieve IClientAPI in IncomingPacket structure for later use r...Justin Clark-Casey (justincc)2012-06-082-15/+16
| * | | | Merge branch 'master' into careminsterMelanie2012-06-071-5/+70
| |\ \ \ \ | | |/ / /
| | * | | Log warning if we try to remove a UDP client that has already been removed.Justin Clark-Casey (justincc)2012-06-071-0/+6
| | * | | Allow the thread watchdog to accept an alarm method that is invoked if the ti...Justin Clark-Casey (justincc)2012-06-071-5/+64
| * | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
| * | | | Merge branch 'master' into careminsterMelanie2012-06-061-3/+15
| |\ \ \ \ | | |/ / /
| | * | | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-051-3/+15
| * | | | Merge branch 'avination' into careminsterMelanie2012-06-021-19/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-18/+32
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10