aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-168-32/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | When detaching a scripted item, always consider it modified. Script statesMelanie2010-11-161-0/+2
| | | | | | | | | | | | | | | | | | | | 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
| | |
* | | 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.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-091-1/+1
|\ \ \ | | |/ | |/|
| * | Fix parcel bans to work only on the avatars they're supposed to work on ↵Melanie2010-11-091-1/+0
| | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed.
| * | Formatting cleanup.Jeff Ames2010-11-081-1/+1
| | |
* | | Fix parcel bans to work only on the avatars they're supposed to work on ↵Melanie2010-11-091-1/+0
| |/ |/| | | | | instead of pushing all avatars, even the ones that are allowed.
* | 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-081-0/+7
|\ \ | |/
| * 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
| * Add a method to delete left over / dropped attachmentsMelanie Thielker2010-11-081-0/+32
| |
| * Fix playing sound from HUDsMelanie2010-11-051-0/+1
| |
* | Fix merge artefactsMelanie2010-11-051-55/+18
| |
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-051-26/+58
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix child prims returning after being unlinked and deleted where the root isMelanie2010-11-041-0/+5
| | | | | | | | not deleted
* | Fix creation of a duplicate physics actor on chained drag-copy operations,Melanie2010-11-041-17/+0
| | | | | | | | the main cause for "ghost prims"
* | Fix playing sound from HUDsMelanie2010-11-031-8/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-032-0/+2
|\ \ | |/
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-032-0/+2
| | | | | | | | from a region and allow normal day cycles to be reestablished
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | on incoming transfers in all cases.
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-51/+67
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| |
| * Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-021-3/+17
| | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| | | | | | | | bowlegginess. Didn't work but is better this way anyway.
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| |
| * Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-291-5/+5
| | | | | | | | commenting out most of them as per Mic
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-3/+9
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-23/+96
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-293-23/+96
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later.
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-20/+53
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-285-25/+88
| | |\ \ | | | |/
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-168/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-293-159/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-213-160/+50
| | |\ \ | | | |/ | | | | | | | | dev-appearance
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-203-159/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-274-14/+35
|\ \ \ \ | |/ / /