aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-02-1416-326/+120
|\
| * Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522Justin Clark-Casey (justincc)2010-02-128-50/+50
| * minor: remove completely commented out and unused classJustin Clark-Casey (justincc)2010-02-121-226/+0
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-128-50/+70
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2010-02-082-2/+7
|\ \
| * | Fix two inconsistencies with LightShareCasperW2010-02-052-2/+7
* | | Merge branch 'master' into careminsterMelanie2010-02-0813-64/+175
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-082-18/+18
| |\
| | * endline fix 2Teravus Ovares (Dan Olivares)2010-02-061-6/+6
| | * Endline fixTeravus Ovares (Dan Olivares)2010-02-061-12/+12
| * | 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-052-5/+6
| |/
| * Revert "Old OpenSim installations may have no AssetCaching setting in config-...Justin Clark-Casey (justincc)2010-02-051-3/+1
| * Old OpenSim installations may have no AssetCaching setting in config-include/...Justin Clark-Casey (justincc)2010-02-051-1/+3
| * refactor: chain two ScenePresence constructors together to eliminate common c...Justin Clark-Casey (justincc)2010-02-042-16/+14
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-043-17/+17
| |\
| | * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
| * | minor: one method docJustin Clark-Casey (justincc)2010-02-042-3/+8
* | | Merge branch 'master' into careminsterMelanie2010-02-046-371/+1190
|\ \ \ | | |/ | |/|
| * | 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: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-3/+1
| * | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-10/+8
| * | 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
| * | refactor: move world comm message queueing into its own methodJustin Clark-Casey (justincc)2010-02-021-23/+13
* | | 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-0213-282/+472
|\ \
| * | Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| |/
| * minor: rename GetScriptPrimType() to GetPrimType()Justin Clark-Casey (justincc)2010-02-012-4/+4
| * move hollow sphere faces bug back up to LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-37/+52
| * remove now duplicated shape code from LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-194/+49
| * Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ...Justin Clark-Casey (justincc)2010-02-012-1/+192
| * Actually make EventManager.OnAttach() fire when an object is attached. Previ...Justin Clark-Casey (justincc)2010-02-012-2/+6
| * Don't try to start attachment scripts or send updates if the attachment itsel...Justin Clark-Casey (justincc)2010-02-012-27/+64
| * apply http://opensimulator.org/mantis/view.php?id=4486Justin Clark-Casey (justincc)2010-01-301-1/+1
| * Apply http://opensimulator.org/mantis/view.php?id=3334Justin Clark-Casey (justincc)2010-01-294-1/+58