aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into presence-refactorMelanie2010-02-0863-3471/+5604
|\ | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check!
| * 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
| | |/
| | * 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: one method docJustin Clark-Casey (justincc)2010-02-042-3/+8
| |/
| * 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
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| | |\
| | * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | 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
| | |/ | |/|
| * | 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
| * 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
| | | | | | | | callers can use it
| * Actually make EventManager.OnAttach() fire when an object is attached. ↵Justin Clark-Casey (justincc)2010-02-012-2/+6
| | | | | | | | Previously, only detach was firing!
| * Don't try to start attachment scripts or send updates if the attachment ↵Justin Clark-Casey (justincc)2010-02-012-27/+64
| | | | | | | | itself has been unsuccessful
| * apply http://opensimulator.org/mantis/view.php?id=4486Justin Clark-Casey (justincc)2010-01-301-1/+1
| | | | | | | | | | fix compilation of mrm scripts using microthreaded parmeter Thanks ziah
| * Apply http://opensimulator.org/mantis/view.php?id=4504Justin Clark-Casey (justincc)2010-01-291-1/+3
| | | | | | | | | | Stop the REST console crashing when entering return on an empty line Thanks BlueWall
| * Apply http://opensimulator.org/mantis/view.php?id=3334Justin Clark-Casey (justincc)2010-01-294-1/+58
| | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution
| * Apply http://opensimulator.org/mantis/view.php?id=4548Justin Clark-Casey (justincc)2010-01-291-1/+1
| | | | | | | | | | Fix command params check on fcache expire <datetime> Thanks coyled
| * use common sop2 setup for TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+12
| |
| * make TestSaveOarV0_2() use a common part2 constructionJustin Clark-Casey (justincc)2010-01-291-18/+14
| |
| * use common part1 createio nin TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+5
| |
| * minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-25/+13
| |