aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-232-15/+4
| |\
| | * Let CHANGED_SCALE also trigger when editing prims and linksets with the ↵Marck2010-11-221-0/+2
| | | | | | | | | | | | | | | | | | viewer's edit tools. This event used to trigger only when the scale was changed with a script.
| | * Let CHANGED_SHAPE trigger. This fixes Mantis #1844.Marck2010-11-221-15/+2
| | |
| * | adapt tests to use DeRezObjects() since DeRezObject() has recently disappearedJustin Clark-Casey (justincc)2010-11-221-2/+7
| | |
| * | add basic tests to check that under default permissions module owner can ↵Justin Clark-Casey (justincc)2010-11-224-11/+186
| |/ | | | | | | delete objects and that non-owners (who are also not administrators, etc.) cannot
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2112-91/+211
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-213-10/+40
| | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
| * Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-215-48/+89
| | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
| * Prevent leftover attachments from clogging up the pipesMelanie2010-11-161-1/+4
| |
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-167-33/+76
| | | | | | | | | | | | | | 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.
| * Diva needs a spanking! Serializing OldItemID breaks script state persistence ↵Melanie2010-11-161-1/+4
| | | | | | | | in agent inventory.
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-3/+48
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Prevent teleporting to a region when the egent is banned in all parcelsMelanie2010-11-101-0/+7
| |
| * 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
| |
| * Reinstate a lost fixMelanie2010-11-081-2/+1
| |
| * 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
| |
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-055-32/+54
|\ \ | |/
| * Fix playing sound from HUDsMelanie2010-11-051-0/+1
| |
| * 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
| * 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
| |
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
| * 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.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-11/+11
|\ \ | |/
| * 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.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-10/+16
|\ \ | |/
| * 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 mantis5110Jonathan Freedman2010-10-293-20/+92
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | 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 '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
| | * | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| | | | |
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-177/+86
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-285-25/+88
| |\ \ \ \ | | |/ / /
| | * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| | | | |
| | * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-262-4/+4
| | |\ \ \
| | | * | | Formatting cleanup.Jeff Ames2010-10-272-4/+4
| | | | | |
| | * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| | |/ / / | | | | | | | | | | | | | | | specific applications