aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-104-8/+58
|\
| * Fix code to check for no spawn points. Possibly a merge artefact?Melanie2013-02-101-2/+4
| |
| * Adding contributor to credits: Welcome Allen Kerensky!BlueWall2013-02-101-0/+1
| |
| * Additional ThreadPool worker and IOCP thread startup logicAllen Kerensky2013-02-101-6/+39
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Fix teleport/telehub issue:BlueWall2013-02-102-3/+17
| | | | | | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
* | Merge branch 'master' into careminsterMelanie2013-02-1028-298/+792
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-0826-279/+697
| |\
| | * Fixed ReadSculptData(): the check whether there are enough bytes to read was ↵Oren Hurvitz2013-02-091-5/+6
| | | | | | | | | | | | incorrect
| | * Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0920-259/+716
| | |\
| | | * BulletSim: add parameter to set global contact breaking threshold. Update ↵Robert Adams2013-02-086-0/+7
| | | | | | | | | | | | | | | | DLLs and SOs for setting same.
| | | * BulletSim: Change BSCharacter to use new base Density and FrictionRobert Adams2013-02-082-16/+12
| | | | | | | | | | | | | | | | variables rather than own local varaibles.
| | | * BulletSim: fix avatar bobbing or jiggling while stationary flying.Robert Adams2013-02-086-19/+34
| | | | | | | | | | | | | | | | Various comments and debugging message mods.
| | | * BulletSim: add initial instance of the ExtendedPhysics region module which ↵Robert Adams2013-02-081-0/+163
| | | | | | | | | | | | | | | | adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default.
| | | * BulletSim: include the linkage to the layered prim implementation. Separate ↵Robert Adams2013-02-088-225/+109
| | | | | | | | | | | | | | | | layers for physical (vs simulator) location displacement and linksets.
| | | * BulletSim: reclass BSPrim into layers so linkset and physical world ↵Robert Adams2013-02-082-0/+297
| | | | | | | | | | | | | | | | displacement is implemented as overlay classes rather than if statements scattered about.
| | * | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ↵Justin Clark-Casey (justincc)2013-02-091-5/+2
| | | | | | | | | | | | | | | | the return values have changed.
| | * | Added physics parameters support to MSSQL and SQLite (not tested)Oren Hurvitz2013-02-096-13/+71
| | | |
| * | | Make JsonStore path parsing more robust. Should fix theMic Bowman2013-02-082-21/+59
| | |/ | |/| | | | | | | invalid path problem.
| * | Broaden the internal OSD type checks to parse JSON that hasMic Bowman2013-02-081-2/+29
| | | | | | | | | | | | non string values.
* | | Merge branch 'master' into careminsterMelanie2013-02-0813-95/+352
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-02-081-32/+57
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-10/+17
| | |\
| | * | Don't allow exceptions to propogate from FlotsamAssetCache which may occur ↵Justin Clark-Casey (justincc)2013-02-081-32/+57
| | | | | | | | | | | | | | | | | | | | | | | | when deleting expired files or stamping the region status file. Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
| * | | Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-083-2/+70
| | |/ | |/| | | | | | | variable to enable binding to dynamic attributes.
| * | Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.Mic Bowman2013-02-083-10/+17
| |/ | | | | | | Fix the link message status when reading a notecard.
| * If a component of a coalesced object fails to deserialization, do not add a ↵Justin Clark-Casey (justincc)2013-02-081-4/+18
| | | | | | | | | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading.
| * On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | | | | | continue with the IAR load rather than failing completely.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-083-35/+105
| |\
| | * BulletSim: Adapt BulletSim to the newer physical properties. ViewerRobert Adams2013-02-072-30/+28
| | | | | | | | | | | | dialog setting of friction, restitution, ... working.
| | * BulletSim: fix exceptions caused by setting physical properties before the ↵Robert Adams2013-02-071-5/+10
| | | | | | | | | | | | prim body is initialized.
| | * BulletSim: add user setting of friction, density and restitution.Robert Adams2013-02-073-27/+94
| | |
| * | Refine TestJsonReadNotecard() and use / instead of . to separate paths.Justin Clark-Casey (justincc)2013-02-081-15/+46
| |/ | | | | | | | | | | | | An attack of the stupid meant that I was using / as a path separator. Fixing this makes the tests behave better, though still with some questions. Also, I imagine / shouldn't really put data in the root as that's not a valid identifier. This commit also fix the / mistake in other tests those this does not affect their outcomes.
| * Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.Justin Clark-Casey (justincc)2013-02-081-9/+33
| | | | | | | | Assertions for loading to non-root paths are currently commented out because this doesn't seem to be working. Will be raising mantis to resolve.
* | Merge branch 'master' into careminsterMelanie2013-02-081-10/+98
|\ \ | |/
| * Stop wrongly create a receiving store already populated with "Hello":"World" ↵Justin Clark-Casey (justincc)2013-02-081-1/+3
| | | | | | | | in TestJsonReadNotecard()
| * Extend TestJsonWriteNotecard() regression test for cases with fake paths and ↵Justin Clark-Casey (justincc)2013-02-081-8/+61
| | | | | | | | | | | | fake stores. Also separates out TestJsonWriteReadNotecard() into separate write and read tests
| * Extend TestJsonSetValue() regressio ntes tto test against a fake storeJustin Clark-Casey (justincc)2013-02-081-0/+5
| |
| * Extend TestJsonTestPath() regression test with checks against fake values ↵Justin Clark-Casey (justincc)2013-02-081-0/+8
| | | | | | | | and fake stores
| * Add tests for removing fake values/from fake store in TestJsonRemoveValue()Justin Clark-Casey (justincc)2013-02-071-0/+11
| | | | | | | | Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
| * Add testing for getting non-existing values and values from a non-existing ↵Justin Clark-Casey (justincc)2013-02-071-1/+10
| | | | | | | | datastore to TestJsonGetValue()
* | Merge branch 'master' into careminsterMelanie2013-02-071-0/+20
|\ \ | |/
| * Actually plumb the new values to physics.Melanie2013-02-071-0/+20
| |
* | Merge branch 'master' into careminsterMelanie2013-02-073-15/+29
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-073-15/+29
| |\
| | * Add TestJsonDestoreStoreNotExists()Justin Clark-Casey (justincc)2013-02-071-0/+14
| | | | | | | | | | | | | | | This still returns true even if we ask to destroy a store that does not exist. Need to check that this is more appropriate behaviour.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-0734-2976/+4555
| | |\
| | * | Fix a recent regression in e17392a where JsonSetValue() stopped working ↵Justin Clark-Casey (justincc)2013-02-073-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably other functions as well). Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten. This was actually picked up by the TestJsonSetValue() regression test failing But this isn't being run on jenkins due to the .net version issue. This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
* | | | Merge branch 'master' into careminsterMelanie2013-02-070-0/+0
|\ \ \ \ | |/ / /
| * | | Add some more code from Avination. This changes physics actor stuff aroundMelanie2013-02-073-40/+165
| | |/ | |/| | | | | | | to work with the new params. Not actually plumbed just yet.
generated by cgit v1.1 at 2024-12-17 07:45:04 +0000