aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-081-1/+4
|\
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-081-1/+4
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-051-1/+1
| * Line endingsDan Lake2011-11-231-101/+101
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+3
|\ \ | |/
| * Correct test failure in sit position check of TestSitAndStandWithNoTarget()Justin Clark-Casey (justincc)2011-11-071-1/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-071-1/+1
|\ \ | |/
| * That such a trivial change can be so difficult to get right. Fix it this time.Melanie2011-11-071-1/+1
| * Fix build breakMelanie2011-11-071-1/+1
| * Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
* | Fix up failing test to compensate for changed sit target offsetMelanie2011-11-061-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-11-052-3/+40
|\ \ | |/
| * Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-052-3/+40
* | Merge branch 'master' into bigmergeMelanie2011-10-262-1/+2
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-252-1/+2
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss...Justin Clark-Casey (justincc)2011-10-221-1/+1
* | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-252-2/+2
|\ \ | |/
| * Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...Dan Lake2011-10-192-2/+2
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-251-3/+1
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w...Justin Clark-Casey (justincc)2011-10-171-3/+1
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-252-2/+23
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-172-2/+23
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-252-0/+42
|\ \ | |/
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-172-0/+42
* | 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 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-121-10/+0
|\ \ | |/
* | Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmergeMelanie2011-10-121-7/+5
|\ \ | |/
| * Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ob...Dan Lake2011-10-041-14/+2
* | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-4/+2
|\ \ | |/
| * Removed redundant code in AttachmentsModule and simplified interfaces which c...Dan Lake2011-10-031-4/+2
* | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-112-75/+4
|\ \ | |/
| * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-222-75/+4
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-211-1/+1
* | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-111-4/+12
|\ \ | |/
| * When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-211-4/+12
* | Bring us up to date.Tom2011-09-141-14/+80
|\ \ | |/
| * Fix test failure. Oversight in setting up the tests themselves.Justin Clark-Casey (justincc)2011-09-081-1/+2
| * Centralize module setup for NPC tests.Justin Clark-Casey (justincc)2011-09-081-41/+21
| * Remember to set and unset the fire and forget method at the top of the attach...Justin Clark-Casey (justincc)2011-09-081-2/+10
| * Use scene presence agent id for rezzed object ownership rather than item owner.Justin Clark-Casey (justincc)2011-09-081-0/+77
* | First set of merge fixesTom2011-09-071-101/+101
* | Resolve merge commits, stage 1Tom2011-09-044-47/+265
|\ \ | |/
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-011-1/+0
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-311-5/+1