Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Angular motor adjustments | Kitto Flora | 2010-02-12 | 1 | -22/+26 |
| | |||||
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-02-12 | 31 | -2768/+2925 |
|\ | |||||
| * | Resolve a merge issue | Melanie | 2010-02-08 | 1 | -79/+86 |
| | | |||||
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-02-08 | 2 | -2/+7 |
| |\ | | | | | | | | | | careminster | ||||
| * \ | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 31 | -2689/+2839 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-08 | 7 | -27/+133 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-08 | 20 | -2650/+2689 |
| | | |\ \ | |||||
| | | * | | | add some method doc to IDynamicTextureManager | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -2/+59 |
| | | | | | | |||||
| | | * | | | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 2 | -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-08 | 4 | -17/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence | ||||
| | | * | | | minor: log what kind of wearable cannot be found | Justin Clark-Casey (justincc) | 2010-02-05 | 2 | -5/+6 |
| | | | | | | |||||
| | * | | | | Bug fix in configger | Melanie | 2010-02-08 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
| | * | | | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched | Melanie | 2010-02-08 | 3 | -0/+438 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Hurliman | 2010-02-06 | 2 | -18/+18 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | mysql-performance | ||||
| | | * | | | endline fix 2 | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -6/+6 |
| | | | | | | |||||
| | | * | | | Endline fix | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -12/+12 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-06 | 5 | -19/+24 |
| | | |\ \ \ | | | | |/ / | |||||
| | | * | | | Fixing an incorrect logging message in insertUserRow | OpenSim Master | 2010-02-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | * Fixed the Cable Beach inventory server to save the CreatorID as well as ↵ | OpenSim Master | 2010-02-06 | 1 | -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 ScienceSim | 2010-02-05 | 15 | -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 insertUserRow | OpenSim Master | 2010-02-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | * Fixed the Cable Beach inventory server to save the CreatorID as well as ↵ | OpenSim Master | 2010-02-05 | 1 | -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-05 | 1 | -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-05 | 1 | -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-04 | 2 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | | code. No functional changes | ||||
| | * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-04 | 3 | -17/+17 |
| | |\ \ \ | |||||
| | | * | | | Applying patch #4534 by Misterblue to fix ODE physics stickiness | John Hurliman | 2010-02-04 | 1 | -0/+2 |
| | | |/ / | |||||
| | * | | | minor: one method doc | Justin Clark-Casey (justincc) | 2010-02-04 | 2 | -3/+8 |
| | | | | | |||||
* | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-02-08 | 13 | -416/+1237 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix two inconsistencies with LightShare | CasperW | 2010-02-05 | 2 | -2/+7 |
| |/ / / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 10 | -378/+1194 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Revert "change position of OnAttach event firing so that this also happens ↵ | Melanie | 2010-02-04 | 2 | -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 warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 3 | -6/+3 |
| | | | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+3 |
| | |\ | |||||
| | * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+1 |
| | | | | |||||
| | * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -10/+8 |
| | | | | |||||
| | * | | minor: add a smidgen of EventManager doc | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -6/+6 |
| | | | | |||||
| | * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | For each delegate added to events in the EventManager, catch and log but do ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -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 sop | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -1/+24 |
| | | | | |||||
| | * | | minor: comment out a log line in ScenePresence | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -2/+1 |
| | | | | |||||
| | * | | minor: remove a couple of mono warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -4/+1 |
| | | | | |||||
| | * | | change position of OnAttach event firing so that this also happens when a ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -15/+17 |
| | | | | | | | | | | | | | | | | user teleports into a region | ||||
| | * | | refactor: move world comm message queueing into its own method | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -23/+13 |
| | | | | |||||
| * | | | Line endings cleanup | Melanie | 2010-02-04 | 1 | -36/+36 |
| | | | | |||||
* | | | | Motor angular decay fix. | Kitto Flora | 2010-02-03 | 1 | -4/+7 |
| | | | | |||||
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-02-03 | 16 | -303/+535 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2010-02-03 | 4 | -20/+60 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-03 | 4 | -17/+57 |
| | |\ \ | | | |/ | |||||
| | | * | minor: copy some method doc from the WorldComm implementation to the interface | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+39 |
| | | | |