aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-2710-64/+103
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-275-54/+71
| | | | | | | | places where we were not already.
| * Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-263-16/+33
| |
| * BulletSim: fix crash around race condition when a mesh asset cannotRobert Adams2013-02-262-8/+12
| | | | | | | | | | be fetched. Update TODO list.
* | Merge branch 'master' into careminsterMelanie2013-02-268-38/+416
|\ \ | |/
| * BulletSim: tweeks to make avatar jump work better.Robert Adams2013-02-251-4/+6
| |
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-255-33/+35
| | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
| * Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
| | | | | | | | | | by MonitorModule. Left existing functionality (command line and HTTP fetch) and just added StatsManager registration.
| * Streamline stat registration code in ServerStats. Remove most of theRobert Adams2013-02-241-160/+50
| | | | | | | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere.
| * Addition of ServerStats shared region module which collects and registersRobert Adams2013-02-241-0/+438
| | | | | | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
* | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-02-236-52/+83
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-222-42/+87
| |\
| | * minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵Justin Clark-Casey (justincc)2013-02-221-0/+6
| | | | | | | | | | | | set only for region crossing and not teleport, etc.
| | * 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' into careminsterMelanie2013-02-2246-638/+921
|\ \ | |/
| * 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
| |
* | Merge branch 'master' into careminsterMelanie2013-02-1611-278/+444
|\ \ | |/
| * 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
| |
* | Merge branch 'master' into careminsterMelanie2013-02-1510-81/+243
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * 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
| |
generated by cgit v1.1 at 2024-11-17 00:55:11 +0000