aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster' into avinationMelanie2012-08-142-4/+9
|\
| * Merge branch 'master' into careminsterMelanie2012-08-042-4/+9
| |\
| | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAp...Justin Clark-Casey (justincc)2012-08-032-4/+9
* | | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
* | | Remove a merge artefaci in IsActive handling and restore commented out correc...Melanie2012-08-031-2/+1
* | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
|/ /
* | Merge branch 'master' into careminsterMelanie2012-07-282-2/+2
|\ \ | |/
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-252-2/+2
* | Merge branch 'master' into careminsterMelanie2012-07-251-1/+2
|\ \ | |/
| * Extend region console "show queues" command to show already collected time si...Justin Clark-Casey (justincc)2012-07-241-1/+2
* | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
|\ \
| * | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-07-201-3/+7
|\ \ \ | |/ /
| * | Fix slow loading of task inventoryMelanie2012-07-191-3/+7
* | | Merge branch 'master' into careminsterMelanie2012-07-202-30/+58
|\ \ \ | |/ / |/| / | |/
| * Make LLClientView instant message handling asynchronous rather than synchrono...Justin Clark-Casey (justincc)2012-07-191-1/+1
| * Prevent race conditions between two threads that call LLClientView.Close() si...Justin Clark-Casey (justincc)2012-07-192-30/+57
* | Merge branch 'avination' into careminsterMelanie2012-07-161-8/+63
|\ \
| * | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| * | Testing changes and instrumentationMelanie2012-07-151-3/+20
| * | Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| * | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| * | Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
* | | 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
|\ \ \ | | |/ | |/|
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-041-1/+1
| * | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem pri...UbitUmarov2012-06-291-0/+3
| * | coment out some of previus debug messaged before forgetting about them...UbitUmarov2012-06-221-2/+2
| * | more debugUbitUmarov2012-06-221-0/+3
| * | i more debugUbitUmarov2012-06-221-1/+1
| * | add a temp debug messageUbitUmarov2012-06-221-0/+3
| * | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-071-4/+29
* | | 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
| |/ /