aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-163-4/+243
|\
| * Actually add the moduleMelanie2012-08-141-0/+234
| * 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
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-041-2/+0
|\ \ \ \ | |/ / /
| * | | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ \ \ | |/ / /
| * | | Remove a merge artefaci in IsActive handling and restore commented out correc...Melanie2012-08-031-2/+1
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-3/+3
|\ \ \ \ | |/ / /
| * | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
| |/ /
* | | merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster...ubit2012-08-023-33/+62
|\ \ \ | |/ /
| * | 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
| |\ \
| * \ \ Merge branch 'avination' into careminsterMelanie2012-07-201-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 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-232-4/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | |_|/ | |/| |
| * | | Fix slow loading of task inventoryMelanie2012-07-191-3/+7
| |/ /
* | | 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