| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 2 | -3/+40 |
|\ |
|
| * | Fix NPC sitting for prims without a sit target. | Justin Clark-Casey (justincc) | 2011-11-05 | 2 | -3/+40 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -7/+4 |
|\ \
| |/ |
|
| * | Rename ForEachAvatar back to ForEachScenePresence. The other changes | Dan Lake | 2011-11-03 | 2 | -3/+3 |
| * | Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to | Dan Lake | 2011-11-03 | 2 | -9/+6 |
| * | Port the Avination offline messaging system to Core | Melanie | 2011-11-02 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 1 | -1/+18 |
|\ \
| |/ |
|
| * | Add "appearance send" command to allow manual sending of appearance. | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -1/+18 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 3 | -18/+13 |
|\ \
| |/ |
|
| * | Removed use of 'is' operator and casting to find the root ScenePresence in Me... | Dan Lake | 2011-10-27 | 2 | -14/+12 |
| * | Added new ForEachRootScenePresence to Scene since almost every delegate passe... | Dan Lake | 2011-10-27 | 1 | -4/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 4 | -1/+4 |
|\ \
| |/ |
|
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 4 | -1/+4 |
* | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 |
* | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -1/+1 |
* | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 3 | -8/+8 |
|\ \
| |/ |
|
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 3 | -8/+8 |
* | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 2 | -7/+2 |
|\ \
| |/ |
|
| * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -7/+2 |
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+23 |
|\ \
| |/ |
|
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -2/+23 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 2 | -0/+42 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -0/+42 |
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 2 | -2/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Change default groups messaging module in hardcode to the empty string. | Melanie | 2011-10-12 | 1 | -1/+1 |
* | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 1 | -10/+0 |
|\ \
| |/ |
|
* | | Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge | Melanie | 2011-10-12 | 1 | -7/+5 |
|\ \
| |/ |
|
| * | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ob... | Dan Lake | 2011-10-04 | 1 | -14/+2 |
* | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+2 |
|\ \
| |/ |
|
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -4/+2 |
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 3 | -76/+5 |
|\ \
| |/ |
|
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 3 | -76/+5 |
* | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Move code which handles NPC movement into Scene so that this can also be used... | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -1/+1 |
* | | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+12 |
|\ \
| |/ |
|
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -4/+12 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -14/+80 |
|\ \
| |/ |
|
| * | Fix test failure. Oversight in setting up the tests themselves. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -1/+2 |
| * | Centralize module setup for NPC tests. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -41/+21 |
| * | Remember to set and unset the fire and forget method at the top of the attach... | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -2/+10 |
| * | Use scene presence agent id for rezzed object ownership rather than item owner. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -0/+77 |
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -101/+101 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 10 | -56/+675 |
|\ \
| |/ |
|
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -1/+0 |
| * | move common code into AttachmentsModule.DeleteAttachmentsFromScene() | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -5/+1 |
| * | Make SP.Attachments available as sp.GetAttachments() instead. | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -7/+3 |