aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-059-337/+278
|\
| * Various bug fixes for appearance handling: more aggressive reset of textures ...Mic Bowman2010-12-031-16/+30
| * Only force prim persistence before delete if the prim is the result of an unp...Justin Clark-Casey (justincc)2010-12-033-8/+26
| * Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-1/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-139/+177
| |\
| | * Reformat an overzealous comment. Remove end of line marks and reference to theMelanie2010-11-271-21/+24
| | * llUnsit position fix 4063 (updated 11-20-2010)Micheil Merlin2010-11-271-2/+27
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-271-15/+25
| | |\
| | | * If we fail to gather asset uuids for a particular asset, log the failing asse...Justin Clark-Casey (justincc)2010-11-271-15/+25
| | * | Refactor appearance and avatar data sending code. Paritioning the routines in...Mic Bowman2010-11-271-114/+117
| | |/
| | * Trigger changed event with CHANGED_TELEPORT when teleporting to another region.Marck2010-11-261-9/+6
| * | Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-291-31/+11
| * | Changed the parser for InventoryItem deserialization. Moved some utility func...Diva Canto2010-11-271-91/+31
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-252-67/+10
| |\ \ | | |/
| | * Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-252-67/+10
| * | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ...Diva Canto2010-11-252-0/+5
| |/
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-236-26/+195
|\ \ | |/
| * 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 viewe...Marck2010-11-221-0/+2
| | * 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 dele...Justin Clark-Casey (justincc)2010-11-224-11/+186
| |/
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-219-85/+182
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-213-10/+40
| * Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-214-48/+76
| * 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-165-27/+60
| * Diva needs a spanking! Serializing OldItemID breaks script state persistence ...Melanie2010-11-161-1/+4
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-3/+48
|\ \ | |/
| * 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 inste...Melanie2010-11-091-1/+0
| * 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
| * Call the cleanup after saving attachment states, so that the attachmentsMelanie2010-11-081-1/+3
| * Call the Cleanup when an agent logs out, when an agent leaves and justMelanie2010-11-081-0/+3
| * Add a method to delete left over / dropped attachmentsMelanie Thielker2010-11-081-0/+32
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-053-32/+52
|\ \ | |/
| * Fix playing sound from HUDsMelanie2010-11-051-0/+1
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| * 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 -ver...Diva Canto2010-11-021-3/+17
* | 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
* | 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, commentin...Justin Clark-Casey (justincc)2010-10-291-5/+5