aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-142-4/+93
|\
| * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-151-4/+6
| |
| * Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its ↵Justin Clark-Casey (justincc)2010-12-141-0/+0
| | | | | | | | contents
| * minor: disable debug logging for previous testJustin Clark-Casey (justincc)2010-12-141-1/+1
| |
| * Start implementing a test for 'share with group' object functionality. Not ↵Justin Clark-Casey (justincc)2010-12-141-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-refactorMelanie2010-12-141-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.Melanie2010-12-141-4/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-134-19/+20
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-142-6/+9
| | |\
| | | * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 permissionsMelanie2010-12-131-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-142-13/+11
| | |/ | | | | | | | | | | | | | | | 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 Canto2010-12-132-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 ↵Melanie2010-12-132-6/+9
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-15/+1
| | | | | | | | | | | | | | | | | | | | | 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 permissionsMelanie2010-12-131-1/+18
| | | | | | | | | | | | | | | work better. Add a generic group permissions hoot to the scene permissions system.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-132-9/+5
|\ \ \ | |/ / |/| / | |/
| * Trigger event with flag CHANGED_LINK when agent sits on objects that have ↵Marck2010-12-122-9/+6
| | | | | | | | not a sit target defined. This fixes Mantis #4692.
| * Fixes the nudge movements!Diva Canto2010-12-113-47/+19
| |
* | Fix a perms issue when wearing an object from inworldMelanie2010-12-121-10/+18
| |
* | Apply the useful part of diva's patch that was skippedMelanie2010-12-122-31/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-2/+21
|\ \ | |/
| * Revert "Another stab at mantis #5256"Diva Canto2010-12-101-12/+6
| | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.
| * Another stab at mantis #5256Diva Canto2010-12-101-6/+12
| |
| * fix the minimap sitting avatar location bugJustin Clark-Casey (justincc)2010-12-101-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-refactorMelanie2010-12-091-1/+1
|\ \ | |/
| * Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
| | | | | | | | whether or not an agent is allowed there as a root agent.
| * change doc. trivial commit to get panda to rebuildJustin Clark-Casey (justincc)2010-12-081-1/+1
| |
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
| | | | | | | | whether or not an agent is allowed there as a root agent.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-0/+1
|\ \ | |/
| * Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-052-4/+3
| | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0511-337/+318
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-236-26/+195
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2112-91/+211
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-3/+48
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-055-32/+54
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-11/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-10/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-293-20/+92
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-177/+86
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-241-3/+16
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵Mic Bowman2010-12-031-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.Melanie2010-12-031-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵Melanie2010-12-031-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953.
* | | | | | | | | | | | Improve health reportingMelanie2010-12-031-10/+18
| | | | | | | | | | | |
* | | | | | | | | | | | Fix health reporting. This will now actually monitor the threads properlyMelanie2010-12-031-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 ↵Melanie2010-12-031-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-refactorMelanie2010-12-037-131/+78
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 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-033-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets
generated by cgit v1.1 at 2024-12-26 12:08:16 +0000