aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-054-42/+144
|\
| * Fix bug where approximately half the time, attachments would rez only their r...Justin Clark-Casey (justincc)2010-03-094-43/+138
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-03-192-26/+10
|\ \
| * | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-26/+10
* | | Fix sit with autopilot.Kitto Flora2010-03-191-3/+5
|/ /
* | RotLookAt repaired; debug msg cleanup.Kitto Flora2010-03-142-35/+4
* | Resolved mergeKitto Flora2010-03-1215-226/+761
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0615-210/+761
| |\ \ | | |/
| | * - implementing server 1.38 functionsunknown2010-03-061-0/+5
| | * Formatting cleanup.Jeff Ames2010-02-221-1/+1
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-1615-208/+716
| | |\
| | | * Formatting cleanup.Jeff Ames2010-02-159-102/+102
| | | * Fixes a bug in the previous patch.Revolution2010-02-151-18/+13
| | | * Plug a small holeMelanie2010-02-141-0/+3
| | | * Revolution is on the roll again! :)Revolution2010-02-149-106/+616
| | * | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst...Justin Clark-Casey (justincc)2010-02-162-11/+26
| | |/
* | | Dynamics Integration Part 1Kitto Flora2010-03-111-1/+10
|/ /
* | Allow particles and texture anims to be persisted to XML. This behaviour is e...CasperW2010-02-251-2/+0
* | Disable blocking teleports within the same parcel for now; it's not implement...CasperW2010-02-251-2/+4
* | Plug a small holeMelanie2010-02-151-0/+3
* | Merge branch 'master' into careminsterMelanie2010-02-142-1/+2
|\ \ | |/
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-122-1/+2
* | Merge branch 'master' into careminsterMelanie2010-02-087-43/+147
|\ \ | |/
| * add some method doc to IDynamicTextureManagerJustin Clark-Casey (justincc)2010-02-081-2/+59
| * refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObj...Justin Clark-Casey (justincc)2010-02-082-5/+12
| * Add EventManager.OnIncomingSceneObject event which is triggered by an incomin...Justin Clark-Casey (justincc)2010-02-084-17/+58
| * minor: log what kind of wearable cannot be foundJustin Clark-Casey (justincc)2010-02-051-3/+2
| * refactor: chain two ScenePresence constructors together to eliminate common c...Justin Clark-Casey (justincc)2010-02-041-15/+11
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-042-17/+15
| |\
| * | minor: one method docJustin Clark-Casey (justincc)2010-02-041-3/+7
* | | Merge branch 'master' into careminsterMelanie2010-02-043-335/+1168
|\ \ \ | | |/ | |/|
| * | Revert "change position of OnAttach event firing so that this also happens wh...Melanie2010-02-042-17/+15
| |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-031-3/+3
| |\
| * | minor: add a smidgen of EventManager docJustin Clark-Casey (justincc)2010-02-032-6/+6
| * | For each delegate added to events in the EventManager, catch and log but do n...Justin Clark-Casey (justincc)2010-02-031-314/+1128
| * | add an IsRoot property to sopJustin Clark-Casey (justincc)2010-02-032-1/+24
| * | minor: comment out a log line in ScenePresenceJustin Clark-Casey (justincc)2010-02-031-2/+1
| * | minor: remove a couple of mono warningsJustin Clark-Casey (justincc)2010-02-032-4/+1
| * | change position of OnAttach event firing so that this also happens when a use...Justin Clark-Casey (justincc)2010-02-032-15/+17
* | | Line endings cleanupMelanie2010-02-041-36/+36
* | | Merge branch 'master' into careminsterMelanie2010-02-034-20/+60
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| |\ \ | | |/
| | * minor: copy some method doc from the WorldComm implementation to the interfaceJustin Clark-Casey (justincc)2010-02-021-0/+39
| | * minor: add method doc to sop.SetScriptEvents()Justin Clark-Casey (justincc)2010-02-021-0/+5
| | * minor: add some documentation to EventManager.OnObjectGrabJustin Clark-Casey (justincc)2010-02-021-15/+8
| | * minor: add reminder to lock SOG.Children before using it directly in order to...Justin Clark-Casey (justincc)2010-02-021-2/+5
| * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| |/
* | Merge branch 'master' into careminsterMelanie2010-02-028-31/+351
|\ \
| * | Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| |/
| * minor: rename GetScriptPrimType() to GetPrimType()Justin Clark-Casey (justincc)2010-02-011-2/+2