| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 4 | -8/+18 |
|\ |
|
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte... | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -3/+3 |
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -4/+2 |
| * | Make it possible to force all prims to be phantom via the collidable_prim boo... | Justin Clark-Casey (justincc) | 2011-12-22 | 2 | -1/+13 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | And a typo fix | Melanie | 2011-12-22 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Add a few comments, correct a merge artefact | Melanie | 2011-12-22 | 1 | -1/+6 |
| * | Harmonizing SP with Avination | Melanie | 2011-12-22 | 1 | -41/+55 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -117/+112 |
|\ \
| |/ |
|
| * | Fixing a bug introduced yesterday. This put the precondition test inside Chec... | Diva Canto | 2011-12-22 | 1 | -105/+109 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 1 | -4/+1 |
| |\ |
|
| * | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 1 | -5/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Though the viewer warns about receiving this, not sending appears to break ba... | Justin Clark-Casey (justincc) | 2011-12-20 | 1 | -4/+1 |
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-20 | 7 | -193/+153 |
| |\ |
|
| * | | Changed the async approach on close child agents. This may improve crossings ... | Diva Canto | 2011-12-16 | 2 | -7/+7 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 2 | -6/+44 |
|\ \ \
| | |/
| |/| |
|
| * | | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a... | Justin Clark-Casey (justincc) | 2011-12-19 | 2 | -6/+44 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -2/+5 |
|\ \ \
| |/ / |
|
| * | | Stop sending the viewer its own AvatarAppearance packet. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+4 |
| * | | Migrate detailed "appearance show" report generation up to AvatarFactoryModul... | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 7 | -234/+154 |
|\ \ \
| |/ / |
|
| * | | Fix bug where objects could not be set to a new group if the group had been c... | Justin Clark-Casey (justincc) | 2011-12-17 | 4 | -17/+8 |
| * | | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim... | Justin Clark-Casey (justincc) | 2011-12-17 | 2 | -142/+81 |
| * | | Stop generating client flags when we send out full object updates. | Justin Clark-Casey (justincc) | 2011-12-16 | 3 | -27/+10 |
| * | | Don't pass on ChaneWaterHeight event from EventManager is new water height is... | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+6 |
| |/ |
|
| * | No functional changes. Changed the prefix of that log message [CONNECTION BEG... | Diva Canto | 2011-12-16 | 2 | -15/+15 |
| * | Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() whe... | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -6/+2 |
| * | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -27/+32 |
* | | Fix hit testing link sets properly. Fix raycasting for LSL. | Melanie | 2011-12-17 | 1 | -6/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 2 | -11/+5 |
|\ \
| |/ |
|
| * | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 |
| * | Reorder clearing of upate schedule on SOP to before sending updates. Fix pote... | Dan Lake | 2011-12-13 | 1 | -11/+3 |
* | | Comment debug spam | Melanie | 2011-12-13 | 1 | -1/+1 |
* | | Prevent a nasty deadlock on teleport | Melanie | 2011-12-12 | 1 | -24/+22 |
* | | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 |
* | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 1 | -2/+14 |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 4 | -47/+55 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 4 | -47/+55 |
| |\ \
| | |/ |
|
| | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo... | Dan Lake | 2011-12-12 | 4 | -46/+55 |
* | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 |
|/ / |
|
* | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 1 | -0/+1 |
* | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 2 | -119/+143 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 3 | -53/+40 |
|\ \
| |/ |
|
| * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -24/+38 |
| * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ... | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -29/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 2 | -8/+6 |
|\ \
| |/ |
|
| * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i... | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+6 |