Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable blocking teleports within the same parcel for now; it's not ↵ | CasperW | 2010-02-25 | 1 | -2/+4 |
| | | | | implemented correctly. Will review soon. | ||||
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-02-16 | 1 | -3/+6 |
|\ | | | | | | | careminster | ||||
| * | Fix an inconsistency in llSetPayPrice between SL and OS behaviour | CasperW | 2010-02-15 | 1 | -3/+6 |
| | | |||||
* | | Change a condition to actually make linden land reclaim work | Melanie | 2010-02-16 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of ssh://TOR/var/git/careminster | CasperW | 2010-02-15 | 1 | -0/+3 |
|\ | |||||
| * | Plug a small hole | Melanie | 2010-02-15 | 1 | -0/+3 |
| | | |||||
* | | Implement missing llGetPrimitiveParams parameters | CasperW | 2010-02-15 | 1 | -32/+138 |
|/ | |||||
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-02-14 | 2 | -81/+152 |
|\ | | | | | | | careminster | ||||
| * | 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 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-02-08 | 13 | -416/+1237 |
| |\ \ | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * | | | | AngMotor update 1 | Kitto Flora | 2010-02-02 | 2 | -79/+143 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 32 | -398/+353 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | * SQLite match code casing with regionsettings table field casing (what's ↵ | Teravus Ovares (Dan Olivares) | 2010-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | * This is an attempt to resolve mantis 4437 by using SqliteAdapter type ↵ | Teravus Ovares (Dan Olivares) | 2010-02-13 | 1 | -11/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522 | Justin Clark-Casey (justincc) | 2010-02-12 | 15 | -85/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | minor: remove completely commented out and unused class | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -226/+0 |
| | | | | | |||||
| * | | | | Fix http://opensimulator.org/mantis/view.php?id=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 13 | -72/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Add license header and change branded namespace to generic | Melanie | 2010-02-08 | 3 | -3/+84 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | Fix two inconsistencies with LightShare | CasperW | 2010-02-05 | 2 | -2/+7 |
| | | | | | |||||
* | | | | | 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' 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. |