aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Make reset of EntityTransferStateMachine for an avatar transfer always ↵Justin Clark-Casey (justincc)2013-02-221-42/+81
| | | | | | | | | | | | | | happen despite unexpected exceptions. This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again. This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
* | Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-224-7/+8
|/ | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-212-2/+2
|\
| * minor: Change summary in "show appearance" console command to "incomplete" ↵Justin Clark-Casey (justincc)2013-02-212-2/+2
| | | | | | | | | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present.
* | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-214-11/+27
|/ | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
* BulletSim: add OutOfBounds logic and some position sanity checkingRobert Adams2013-02-215-33/+68
| | | | to eliminate some of the "cannot find terrain height" warning messages.
* Add a method to IStatsCollector for returning stats as an OSDMap.Robert Adams2013-02-201-0/+5
| | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
* Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-2019-111/+18
|\
| * Fix the JsonStore path set problem justincc found earlier today andMic Bowman2013-02-194-96/+3
| | | | | | | | remove the deprecated TestPath functions.
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-1915-15/+15
| |
* | Correct mistake in parsing 'show object pos' and similar pos commands where ↵Justin Clark-Casey (justincc)2013-02-201-5/+5
|/ | | | | | the 'to' text would be treat as the end vector rather than discarded. Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
* minor: remove some mono compiler warnings in ↵Justin Clark-Casey (justincc)2013-02-202-5/+5
| | | | OpenSim.Region.ClientStack.Linden.Caps.dll
* Convert JsonTestPath() use in json regression tests to JsonGetPathType() insteadJustin Clark-Casey (justincc)2013-02-191-10/+10
|
* minor: Rename regression test method TestGetArrayLength() -> ↵Justin Clark-Casey (justincc)2013-02-181-1/+1
| | | | JsonTestGetArrayLength() to match others
* BulletSim: experimental lock axis code using constraints. Not enabledRobert Adams2013-02-172-22/+74
| | | | by default. Like more debugging is needed.
* BulletSim: add calls for creating all the different Bullet constraint types.Robert Adams2013-02-175-47/+338
| | | | | Updated the DLLs and SOs and code for BulletXNA to create the types. All the detailed control calls are not all in place yet.
* BulletSim: rework parameter setting for different types of valuesRobert Adams2013-02-175-394/+348
| | | | (like vectors or quaternions).
* * Fix walking to <NaN, NaN, NaN> via autopilot.teravus2013-02-161-1/+5
|
* BulletSim: fix physical object appearing to slowly float off whenRobert Adams2013-02-161-1/+1
| | | | they stop moving.
* Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
|
* Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
|
* Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-1610-34/+188
|
* Enable one sub-test in TestJsonSetValue() which now works (using identifier ↵Justin Clark-Casey (justincc)2013-02-151-17/+13
| | | | | | | with embedded .). Need to look further at other still commented tests. Still need to check coverage against some of Mic's scripts.
* Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> ↵Justin Clark-Casey (justincc)2013-02-152-15/+15
| | | | | | | | JsonGetJson() This is because JsonGetJson() is getting json from anywhere in the structure, not just values. Equally, JsonSetJson() is setting any type of json, not just json which represents a value. Agreed with cmickeyb
* Comment out regression TestJsonTestPath and TestJsonTestPathJson as these ↵Justin Clark-Casey (justincc)2013-02-151-62/+62
| | | | will go away soon
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-152-7/+9
|\
| * * Handle null check on configs in module startup so that the the code can be ↵teravus2013-02-142-7/+9
| | | | | | | | run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
* | Add regression TestJsonList2Path()Justin Clark-Casey (justincc)2013-02-151-2/+27
|/
* Add regression TestGetArrayLength()Justin Clark-Casey (justincc)2013-02-141-0/+33
|
* Add regression TestJsonGetPathType()Justin Clark-Casey (justincc)2013-02-141-0/+47
|
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-142-2/+2
|
* Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and ↵Justin Clark-Casey (justincc)2013-02-143-8/+8
| | | | | | | | JsonArrayLength() -> JsonGetArrayLength() This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
* Make new JsonStore script constants separated with underscores, to be ↵Justin Clark-Casey (justincc)2013-02-141-5/+5
| | | | | | consistent with existing LSL/OSSL, etc script constants. Agreed with cmickeyb
* Add EventManager events triggered when a SOP is added or removedRobert Adams2013-02-142-0/+57
| | | | from the physical scene. Invocations added in SceneObjectPart.
* Add an event and some logic to allow customizing Simulator Features by avatarMelanie2013-02-142-5/+26
|
* Fix a very unlikely-to-occur NullReferenceException race condition in ↵Justin Clark-Casey (justincc)2013-02-141-2/+7
| | | | llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it
* Adds a couple requested functions to the JsonStore scriptMic Bowman2013-02-134-1/+162
| | | | | | interface. JsonPathType returns the type of node pointed to by the path and deprecates the functionality of both JsonTestPath functions. JsonArrayLength returns the length of an array node.
* Make path parsing more robust in the JsonStore.Mic Bowman2013-02-121-12/+6
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-02-1310-156/+522
|\
| * Add more sub-tests to TestJsonSetValue for paths containing []{} without {} ↵Justin Clark-Casey (justincc)2013-02-131-5/+86
| | | | | | | | | | | | | | delineation. As expected, values are not set and the set call returns FALSE (0). As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
| * Extend JsonTestSetValue() with tests for escaping brackets, periods and ↵Justin Clark-Casey (justincc)2013-02-131-2/+71
| | | | | | | | | | | | unbalanced braces from paths The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
| * Add test for array as root element in TestJsonCreateStore()Justin Clark-Casey (justincc)2013-02-131-0/+9
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-02-139-141/+304
| |\
| | * BulletSim: fix density since the simulator/viewer track density in aRobert Adams2013-02-127-25/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
| | * BulletSim: More work on center-of-mass. Remove linksetinfo and rely on ↵Robert Adams2013-02-128-124/+162
| | | | | | | | | | | | simulator to update info.
| * | Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arraysJustin Clark-Casey (justincc)2013-02-131-13/+57
| |/
* | Make the sim features module register it's interface so it can be usedMelanie2013-02-131-0/+2
|/
* Extend TestJsonCreateStore() with a one key input and an input with raw ↵Justin Clark-Casey (justincc)2013-02-121-2/+20
| | | | number values