Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix up some locking issues in task inventory. Don't use any prior versions ↵ | Melanie | 2010-12-22 | 1 | -0/+2 |
| | | | | in production! | ||||
* | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 2 | -2/+3 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -1/+1 |
|\ | |||||
| * | What is the point of using different types to express the same damn thing? | Melanie | 2010-12-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Another good catch. Update file name serial. | Melanie | 2010-12-21 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Added a missed return. Thanks diva! | Melanie | 2010-12-21 | 1 | -0/+1 |
| | | |||||
| * | Fix up merge artifacts | Melanie | 2010-12-21 | 1 | -10/+1 |
| | | |||||
| * | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 3 | -101/+39 |
| | | |||||
* | | Restore CM loking after core extract | Melanie | 2010-12-21 | 1 | -65/+64 |
| | | |||||
* | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 3 | -103/+39 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 2 | -2/+1 |
|\ \ | |/ | |||||
| * | Put the coarse location updates back to 50 frames, otherwise the dots on the ↵ | Diva Canto | 2010-12-19 | 2 | -3/+3 |
| | | | | | | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 4 | -16/+15 |
|\ \ | |/ | |||||
| * | remove mono compiler warning: if (sop.Color != null) always returns true as ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -9/+7 |
| | | | | | | | | sop.Color is a value type. | ||||
| * | remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-12-17 | 3 | -7/+8 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-15 | 2 | -16/+23 |
|\ \ | |/ | |||||
| * | Yet more things out of the main Update thread loop and into threadlets. This ↵ | Diva Canto | 2010-12-14 | 2 | -9/+11 |
| | | | | | | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag. | ||||
| * | Another attempt at moving heavy computation away from the Update loop. #LoginLag | Diva Canto | 2010-12-14 | 1 | -2/+6 |
| | | |||||
| * | Commented out the UpdateLand call from the Update thread loop, because this ↵ | Diva Canto | 2010-12-14 | 2 | -6/+7 |
| | | | | | | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each. | ||||
* | | Make sure the material is set on physical prims | Melanie | 2010-12-15 | 2 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 2 | -4/+93 |
|\ \ | |/ | |||||
| * | fix mistake in last change of local.include | Justin Clark-Casey (justincc) | 2010-12-15 | 1 | -4/+6 |
| | | |||||
| * | Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+0 |
| | | | | | | | | contents | ||||
| * | minor: disable debug logging for previous test | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -1/+1 |
| | | |||||
| * | Start implementing a test for 'share with group' object functionality. Not ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+87 |
| | | | | | | | | | | | | | | yet complete. While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete. Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 1 | -2/+4 |
|\ \ | |/ | | | | | | | Also fix the failure to fire CHANGED_LINK on sit, which is different in our code. | ||||
| * | Null checking ParentGroup is not needed. It can't be null. | Melanie | 2010-12-14 | 1 | -4/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-13 | 2 | -12/+10 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -5/+8 |
| | |\ | |||||
| | | * | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
| | | * | Change some lookups in he Land Management module to make group permissions | Melanie | 2010-12-13 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | work better. Add a generic group permissions hoot to the scene permissions system. | ||||
| | * | | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -7/+2 |
| | |/ | | | | | | | | | | | | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout | ||||
| * | | This seems to get rid of the stuck PREJUMP animation, as reported by Justin ↵ | Diva Canto | 2010-12-13 | 2 | -3/+13 |
| |/ | | | | | | | in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-13 | 1 | -5/+8 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
| * | | Change some lookups in he Land Management module to make group permissions | Melanie | 2010-12-13 | 1 | -1/+18 |
| | | | | | | | | | | | | | | | work better. Add a generic group permissions hoot to the scene permissions system. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 2 | -9/+5 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Trigger event with flag CHANGED_LINK when agent sits on objects that have ↵ | Marck | 2010-12-12 | 2 | -9/+6 |
| | | | | | | | | not a sit target defined. This fixes Mantis #4692. | ||||
| * | Fixes the nudge movements! | Diva Canto | 2010-12-11 | 3 | -47/+19 |
| | | |||||
* | | Fix a perms issue when wearing an object from inworld | Melanie | 2010-12-12 | 1 | -10/+18 |
| | | |||||
* | | Apply the useful part of diva's patch that was skipped | Melanie | 2010-12-12 | 2 | -31/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -2/+21 |
|\ \ | |/ | |||||
| * | Revert "Another stab at mantis #5256" | Diva Canto | 2010-12-10 | 1 | -12/+6 |
| | | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47. | ||||
| * | Another stab at mantis #5256 | Diva Canto | 2010-12-10 | 1 | -6/+12 |
| | | |||||
| * | fix the minimap sitting avatar location bug | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
| | | | | | | | | a sitting avatar should have it's offset position added to the scene object, not its absolute position | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 |
| | |