aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Disable blocking teleports within the same parcel for now; it's not ↵CasperW2010-02-251-2/+4
| | | | implemented correctly. Will review soon.
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-02-161-3/+6
|\ | | | | | | careminster
| * Fix an inconsistency in llSetPayPrice between SL and OS behaviourCasperW2010-02-151-3/+6
| |
* | Change a condition to actually make linden land reclaim workMelanie2010-02-161-1/+1
|/
* Merge branch 'master' of ssh://TOR/var/git/careminsterCasperW2010-02-151-0/+3
|\
| * Plug a small holeMelanie2010-02-151-0/+3
| |
* | Implement missing llGetPrimitiveParams parametersCasperW2010-02-151-32/+138
|/
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-02-142-81/+152
|\ | | | | | | careminster
| * Angular motor adjustmentsKitto Flora2010-02-121-22/+26
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-02-1232-2768/+2947
| |\
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-02-0813-416/+1237
| |\ \
| * | | Motor angular decay fix.Kitto Flora2010-02-031-4/+7
| | | |
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-02-0316-303/+535
| |\ \ \
| * | | | AngMotor update 1Kitto Flora2010-02-022-79/+143
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2010-02-1434-398/+355
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | * SQLite match code casing with regionsettings table field casing (what's ↵Teravus Ovares (Dan Olivares)2010-02-131-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-131-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.
| * | | | minor: update CONTRIBUTORS.txtJustin Clark-Casey (justincc)2010-02-121-0/+1
| | | | |
| * | | | Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522Justin Clark-Casey (justincc)2010-02-1215-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 classJustin Clark-Casey (justincc)2010-02-121-226/+0
| | | | |
| * | | | Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-1213-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 missing refernce to prebuild (backport from presence-refactor)Melanie2010-02-091-0/+1
| | | | |
| * | | | Add license header and change branded namespace to genericMelanie2010-02-083-3/+84
| | | | |
* | | | | 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
| | | | |