aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-168-6/+63
|\
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-1612-61/+109
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
| * Fix osTeleportAgent for hypergrid destinations.Marck2010-11-161-1/+5
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Add osTeleportOwner.Marck2010-11-163-2/+48
| | | | | | | | | | | | | | This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map. The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access. Signed-off-by: Melanie <melanie@t-data.com>
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-161-2/+3
| |\
| | * provide avatar name in log if an exception ends up at the top of an async ↵Justin Clark-Casey (justincc)2010-11-121-2/+3
| | | | | | | | | | | | packet processing stack
| * | Can't detach an object from within the script thread because it will throw. ↵Melanie2010-11-161-6/+14
| | | | | | | | | | | | Use FireAndForget for that.
| * | Diva needs a spanking! Serializing OldItemID breaks script state persistence ↵Melanie2010-11-161-1/+4
| |/ | | | | | | in agent inventory.
| * Add PARCEL_DETAILS_ID to LSLBlueWall2010-11-122-0/+4
| |
| * Prevent teleporting to a region when the egent is banned in all parcelsMelanie2010-11-101-0/+7
| |
| * Remove a debug spamMelanie2010-11-101-1/+0
| |
| * Although the Allow Voice setting is per estate rather than per region,Melanie2010-11-091-1/+3
| | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-162-3/+17
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-11-1113-105/+120
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Fix excessive forward motion and flailing while descending a slope, prevent ↵Kitto Flora2010-11-112-3/+17
| | | | | | | | | | | | | | | | adding motion while falling from flying.
* | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-1613-69/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | | | Can't detach an object from within the script thread because it will throw.Melanie2010-11-161-6/+14
| | | | | | | | | | | | | | | | Use FireAndForget for that.
* | | | When detaching a scripted item, always consider it modified. Script statesMelanie2010-11-162-1/+9
| | | | | | | | | | | | | | | | | | | | will have changed and for real usability, we need to save it. It bloats assets, but that can't be avoided.
* | | | Diva needs a spanking! Serializing OldItemID breaks script stateMelanie2010-11-161-1/+4
| |/ / |/| | | | | | | | persistence in agent inventory.
* | | Prevent teleporting to a region when the egent is banned in all parcelsMelanie2010-11-101-0/+7
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-091-1/+9
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Add option SeeIntoBannedRegion to allow band to act like SL, where you canMelanie2010-11-091-1/+9
| | | | | | | | | | | | | | | | see in but not enter. Defaults to false, so no change.
* | | | Although the Allow Voice setting is per estate rather than per region,Melanie2010-11-091-1/+3
|/ / / | | | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-0910-88/+86
|\ \ \ | | |/ | |/|
| * | Fix parcel bans to work only on the avatars they're supposed to work on ↵Melanie2010-11-092-15/+15
| | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed.
| * | Formatting cleanup.Jeff Ames2010-11-0810-88/+86
| | |
* | | Fix parcel bans to work only on the avatars they're supposed to work on ↵Melanie2010-11-092-15/+15
| |/ |/| | | | | instead of pushing all avatars, even the ones that are allowed.
* | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
| |
* | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
| |
* | Prevent temp-on-rez prims from being persistedMelanie2010-11-081-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-081-7/+0
|\ \ | |/
| * Reinstate a lost fixMelanie2010-11-081-2/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-082-4/+15
|\ \ | |/
| * Fix merge artefactsMelanie2010-11-081-14/+19
| |
| * Prevent plants from being treated like dropped attachments and removedMelanie2010-11-081-2/+1
| | | | | | | | from the sim.
| * Call the cleanup after saving attachment states, so that the attachmentsMelanie2010-11-081-1/+3
| | | | | | | | don't get killed before they can be saved
| * Call the Cleanup when an agent logs out, when an agent leaves and justMelanie2010-11-081-0/+3
| | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport
| * Call attachment cleanup when an agent crosses outMelanie Thielker2010-11-081-0/+2
| |
| * Add a method to delete left over / dropped attachmentsMelanie Thielker2010-11-081-0/+32
| |
| * Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
| |
| * Fix playing sound from HUDsMelanie2010-11-052-2/+17
| |
| * Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-11-051-0/+19
| |
* | Decrease min search length to 2 chars for map search.Melanie2010-11-071-2/+2
| |
* | Fix the inventory transfer module to not cause duplicated text IMsMelanie2010-11-051-3/+6
| |
* | Fix merge artefactsMelanie2010-11-052-59/+22
| |
* | Revert "Spin the AddNewClient process off into a new thread to avoid locking ↵Melanie2010-11-051-24/+1
| | | | | | | | | | | | | | | | | | | | up the LLUDPServer (and therefore the entire scene)" This reverts commit 40e05f41098bdedac7296d84c9aa8d915c5c9ede. Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-059-88/+63
| | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-052-8/+55
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Fix child prims returning after being unlinked and deleted where the root isMelanie2010-11-041-0/+5
| | | | | | | | | | | | not deleted
| * | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
| | |