aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' into careminsterMelanie2010-02-0832-2689/+2861
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-087-27/+133
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-0821-2650/+2711
| | |\ \ \
| | * | | | 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
| * | | | | Bug fix in configgerMelanie2010-02-081-2/+2
| | |/ / / | |/| | |
| * | | | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launchedMelanie2010-02-084-0/+460
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-p...John Hurliman2010-02-062-18/+18
| |\ \ \ \
| | * | | | endline fix 2Teravus Ovares (Dan Olivares)2010-02-061-6/+6
| | * | | | Endline fixTeravus Ovares (Dan Olivares)2010-02-061-12/+12
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-065-19/+24
| | |\ \ \ \ | | | |/ / /
| | * | | | Fixing an incorrect logging message in insertUserRowOpenSim Master2010-02-061-1/+1
| | * | | | * Fixed the Cable Beach inventory server to save the CreatorID as well as pro...OpenSim Master2010-02-061-2/+2
| * | | | | Updated MySQL connection management to use the MySQL connection pooling. This...Master ScienceSim2010-02-0515-2629/+2230
| * | | | | Fixing an incorrect logging message in insertUserRowOpenSim Master2010-02-051-1/+1
| * | | | | * Fixed the Cable Beach inventory server to save the CreatorID as well as pro...OpenSim Master2010-02-051-2/+2
| | |/ / / | |/| | |
| * | | | 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-0410-378/+1194
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Revert "change position of OnAttach event firing so that this also happens wh...Melanie2010-02-042-17/+15
| |/ / /
| * | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-02-033-6/+3
| * | | 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
| * | | | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-1/+1
| * | | | 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-0214-283/+475
|\ \ \ | |_|/ |/| |
| * | 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