aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Resolve a merge issueMelanie2010-02-081-79/+86
|
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-02-082-2/+7
|\ | | | | | | careminster
| * Fix two inconsistencies with LightShareCasperW2010-02-052-2/+7
| |
* | 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 ↵Justin Clark-Casey (justincc)2010-02-082-5/+12
| | | | | | | | | | | | | | | | Scene.AddSceneObject since this wraps a check that is much less clear
| | * | Add EventManager.OnIncomingSceneObject event which is triggered by an ↵Justin Clark-Casey (justincc)2010-02-084-17/+58
| | | | | | | | | | | | | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence
| | * | 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
| | | | | | | | | | | | | | | | | | in place of OpenSim, dump the config to stdout. Use -f xml, -f ini or -f mysql to get a condensed ini file, an xml file suitable for webloading, or a set of mysql insert statements.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2010-02-062-18/+18
| |\ \ | | | | | | | | | | | | mysql-performance
| | * | 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 ↵OpenSim Master2010-02-061-2/+2
| | | | | | | | | | | | | | | | properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
| * | | Updated MySQL connection management to use the MySQL connection pooling. ↵Master ScienceSim2010-02-0515-2629/+2230
| | | | | | | | | | | | | | | | This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way.
| * | | 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 ↵OpenSim Master2010-02-051-2/+2
| | |/ | |/| | | | | | | properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
| * | Revert "Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)" This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules) This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
| * | Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-1/+3
| | | | | | | | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example) Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
| * | refactor: chain two ScenePresence constructors together to eliminate common ↵Justin Clark-Casey (justincc)2010-02-042-16/+14
| | | | | | | | | | | | code. No functional changes
| * | 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 ↵Melanie2010-02-042-17/+15
| |/ | | | | | | | | | | | | | | when a user teleports into a region" The behavior introduced here is not compatible with SL This reverts commit b6bee4999c9d238a052022f105069ea4eb85f8f4.
| * 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 ↵Justin Clark-Casey (justincc)2010-02-031-314/+1128
| | | | | | | | | | | | | | | | | | not propogate any exceptions that come back This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
| * | 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 ↵Justin Clark-Casey (justincc)2010-02-032-15/+17
| | | | | | | | | | | | user teleports into a region
| * | 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 ↵Justin Clark-Casey (justincc)2010-02-021-2/+5
| | | | | | | | | | | | to avoid threading issues
| * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| |/ | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-02-0214-283/+475
|\ \
generated by cgit v1.1 at 2024-11-15 07:04:29 +0000