| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | 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. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 2 | -4/+3 |
| | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 9 | -337/+278 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 6 | -26/+195 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 9 | -85/+182 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -3/+48 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 3 | -32/+52 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -11/+11 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -10/+16 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -20/+53 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -139/+86 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 1 | -3/+16 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 1 | -16/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
| * | | | | | | | | | | | | When linking something, immediately persist the linked set. | Melanie | 2010-12-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵ | Melanie | 2010-12-03 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953. | ||||
| * | | | | | | | | | | | | Improve health reporting | Melanie | 2010-12-03 | 1 | -10/+18 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix health reporting. This will now actually monitor the threads properly | Melanie | 2010-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and not just the http server. It will also restart a dead heartbeat. | ||||
| * | | | | | | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to ↵ | Melanie | 2010-12-03 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another region." This reverts commit 2827deffe822378b6cb35dac6c90a21c3fbc0de7. Pulling out a bad core commit that broke attachment teleporting for us | ||||
| * | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 6 | -131/+77 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| | * | | | | | | | | | | | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
| | * | | | | | | | | | | | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 3 | -139/+177 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 1 | -31/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
| | * | | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility ↵ | Diva Canto | 2010-11-27 | 1 | -91/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions around. | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-25 | 2 | -67/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |