aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-21/+32
* | Merge branch 'master' into bigmergeMelanie2011-11-031-3/+4
|\ \ | |/
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-3/+4
* | Merge branch 'master' into bigmergeMelanie2011-11-021-1/+1
|\ \ | |/
| * Removed redundant SceneContents property from Scene. It's the same as SceneGr...Dan Lake2011-11-011-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-10-301-2/+2
|\ \ | |/
| * Stop setting _position as well as m_taint_position in ODECharacter.PositionJustin Clark-Casey (justincc)2011-10-291-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-10-271-1/+3
|\ \ | |/
| * Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly pa...Justin Clark-Casey (justincc)2011-10-271-1/+3
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-251-0/+1
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-4/+22
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-242-4/+22
* | Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmergeMelanie2011-10-251-8/+14
|\ \ | |/
| * separate out future common setup code from EventQueueTests.AddForClient()Justin Clark-Casey (justincc)2011-10-241-8/+14
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-252-1/+72
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client registe...Justin Clark-Casey (justincc)2011-10-242-1/+72
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-251-15/+10
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w...Justin Clark-Casey (justincc)2011-10-171-15/+10
* | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmergeMelanie2011-10-251-3/+17
|\ \ | |/
| * Add avatar names to debug packet outputJustin Clark-Casey (justincc)2011-10-171-2/+2
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s...Justin Clark-Casey (justincc)2011-10-141-1/+1
* | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * More method doc and formatting changes. Makes DestroyOdeStructures() privateJustin Clark-Casey (justincc)2011-10-131-0/+6
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-1/+1
* | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmergeMelanie2011-10-255-343/+282
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-125-343/+282
* | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmergeMelanie2011-10-253-3/+12
|\ \ | |/
| * minor: insert some commented out log lines which are a blunt but useful instr...Justin Clark-Casey (justincc)2011-10-123-3/+12
* | Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmergeMelanie2011-10-253-17/+39
|\ \ | |/
| * Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollectionJustin Clark-Casey (justincc)2011-10-123-17/+39
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-031-3/+4
| |\
* | | HACK: Remove advanced property resending until it is fixed properly in core.Melanie2011-10-121-10/+14
* | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-111-15/+7
|\ \ \ | |/ /
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-031-15/+7
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-111-3/+4
|\ \ \ | | |/ | |/|
| * | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-031-3/+4
| |/
* | Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmergeMelanie2011-10-111-14/+17
|\ \ | |/
| * Improve locking when access queue in EventQueueGetModuleJustin Clark-Casey (justincc)2011-09-241-14/+17
* | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-111-3/+3
|\ \ | |/
| * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-221-3/+3
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-151-2/+2
* | First set of merge fixesTom2011-09-071-1/+1
* | Resolve merge commits, stage 1Tom2011-09-0411-138/+242
|\ \ | |/
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-011-2/+0
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-011-5/+2