Commit Graph

11777 Commits (efd481085135f60d8f6d3e4615591a26ec3f05f6)

Author SHA1 Message Date
CasperW efd4810851 Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon. 2010-02-25 12:04:51 +01:00
Melanie 92a8d7ce6c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-02-16 23:15:59 +00:00
Melanie d6eff8ebcf Change a condition to actually make linden land reclaim work 2010-02-16 23:14:57 +00:00
CasperW af2d20c5fa Fix an inconsistency in llSetPayPrice between SL and OS behaviour 2010-02-15 22:22:36 +01:00
CasperW 47a9e48f46 Merge branch 'master' of ssh://TOR/var/git/careminster 2010-02-15 06:15:14 +01:00
CasperW 94c417c90c Implement missing llGetPrimitiveParams parameters 2010-02-15 06:10:04 +01:00
Melanie ce3e265575 Plug a small hole 2010-02-15 00:06:03 +00:00
Melanie b2fefe3e3f Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-02-14 22:27:59 +00:00
Melanie 2084e08ad7 Merge branch 'master' into careminster 2010-02-14 22:27:39 +00:00
Teravus Ovares (Dan Olivares) 45493171b0 * SQLite match code casing with regionsettings table field casing (what's with the upper case S in Sandbox while the rest is lower case 0.o)
* It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 .   Sqlite 3 is required, Sqlite 2 was reported.
2010-02-13 05:50:57 -05:00
Teravus Ovares (Dan Olivares) fa6da2f6c6 * This is an attempt to resolve mantis 4437 by using SqliteAdapter type statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437
* Added a 'Create Update Statement' method that takes two fields for a primary key
* Added an Update and Delete command for parcels and land access list table rows.
2010-02-13 05:09:15 -05:00
Justin Clark-Casey (justincc) b2656e62ba minor: update CONTRIBUTORS.txt 2010-02-12 23:16:45 +00:00
Justin Clark-Casey (justincc) 00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Justin Clark-Casey (justincc) aad95fcff5 minor: remove completely commented out and unused class 2010-02-12 22:45:59 +00:00
Justin Clark-Casey (justincc) 802a969267 Fix http://opensimulator.org/mantis/view.php?id=4224
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache.  However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
Kitto Flora 9568718add Angular motor adjustments 2010-02-12 15:56:21 -05:00
Kitto Flora 6a70349512 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-02-12 14:08:32 -05:00
Melanie 1d4d6c821a Add missing refernce to prebuild (backport from presence-refactor) 2010-02-09 20:25:24 +00:00
Melanie 6dcc4ab466 Add license header and change branded namespace to generic 2010-02-08 22:50:59 +00:00
Melanie 0ad8046582 Resolve a merge issue 2010-02-08 22:44:17 +00:00
Melanie ad38450f9c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-02-08 22:43:53 +00:00
Melanie c8f3bb56ff Merge branch 'master' into careminster 2010-02-08 22:11:38 +00:00
Melanie def8f8166a Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-02-08 21:42:23 +00:00
Melanie 5ddd995de8 Bug fix in configger 2010-02-08 21:42:12 +00:00
Justin Clark-Casey (justincc) aba5908860 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-02-08 21:39:46 +00:00
Justin Clark-Casey (justincc) ad28db3669 add some method doc to IDynamicTextureManager 2010-02-08 21:21:21 +00:00
Kitto Flora 59851ceee6 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-02-08 14:29:06 -05:00
Justin Clark-Casey (justincc) 9f4883d146 refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObject since this wraps a check that is much less clear 2010-02-08 19:10:54 +00:00
Justin Clark-Casey (justincc) 00947cf2ca Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object
Add a read-only Attachments property to ScenePresence
2010-02-08 19:02:20 +00:00
Melanie 70a0d7aa46 Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched
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.
2010-02-08 15:21:35 +00:00
John Hurliman 5dc278b0d7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance 2010-02-06 01:05:58 -08:00
Teravus Ovares (Dan Olivares) fabf10f1cf endline fix 2 2010-02-06 00:38:22 -05:00
Teravus Ovares (Dan Olivares) 59f6606ecf Endline fix 2010-02-06 00:37:07 -05:00
Master ScienceSim e1b5c61247 Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way. 2010-02-05 18:07:59 -08:00
OpenSim Master 5f1f5c29e9 Fixing an incorrect logging message in insertUserRow 2010-02-05 18:06:01 -08:00
OpenSim Master 3e697ad57e * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-05 18:05:57 -08:00
Melanie 4a092b5ab8 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-02-06 01:13:01 +00:00
OpenSim Master 6392cfcd61 Fixing an incorrect logging message in insertUserRow 2010-02-06 01:12:45 +00:00
OpenSim Master 97eaae9d84 * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-06 01:12:36 +00:00
Justin Clark-Casey (justincc) bf9fc69d01 minor: log what kind of wearable cannot be found 2010-02-05 19:34:25 +00:00
Justin Clark-Casey (justincc) 68bb2dac45 Revert "Old OpenSim installations may have no AssetCaching setting in 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 7058a4c259.
2010-02-05 19:21:27 +00:00
Justin Clark-Casey (justincc) 7058a4c259 Old OpenSim installations may have no AssetCaching setting in 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
2010-02-05 18:09:27 +00:00
CasperW 044979066c Fix two inconsistencies with LightShare 2010-02-05 00:53:32 +01:00
Justin Clark-Casey (justincc) 0a084a31e9 refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes 2010-02-04 23:23:07 +00:00
Justin Clark-Casey (justincc) 16467f6654 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-02-04 22:22:18 +00:00
Justin Clark-Casey (justincc) f1b99c4a7f minor: one method doc 2010-02-04 21:35:56 +00:00
John Hurliman 8556a9f1a8 Applying patch #4534 by Misterblue to fix ODE physics stickiness 2010-02-04 13:31:06 -08:00
Melanie 776d62b9c6 Merge branch 'master' into careminster 2010-02-04 17:29:33 +00:00
Melanie 2953bee1f4 Revert "change position of OnAttach event firing so that this also happens when a user teleports into a region"
The behavior introduced here is not compatible with SL

This reverts commit b6bee4999c.
2010-02-04 17:11:06 +00:00
Melanie ae9362636e Line endings cleanup 2010-02-04 17:00:16 +00:00