Commit Graph

19099 Commits (a356978c794c4a5b0bac4d6a05bf8534885edc68)

Author SHA1 Message Date
Diva Canto a356978c79 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-25 16:28:12 -08:00
Diva Canto 00da59ae52 Mantis #6552 -- stricter error (crash) if server URL is malformed. 2013-02-25 16:27:41 -08:00
Justin Clark-Casey (justincc) d0cb4fc326 Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
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.
2013-02-25 23:04:38 +00:00
Diva Canto 66c5934d90 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-25 10:25:56 -08:00
Diva Canto 53470d5057 Missing var in [LoginService] for HG Robust. 2013-02-25 10:25:36 -08:00
Diva Canto f7aa018a78 Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles cache. 2013-02-25 10:24:28 -08:00
Robert Adams aa538fe36f Add StatsManager registration for region specific stats as collected
by MonitorModule. Left existing functionality (command line and HTTP
fetch) and just added StatsManager registration.
2013-02-24 07:48:02 -08:00
Robert Adams b2495c9a1e Streamline stat registration code in ServerStats. Remove most of the
usage of ProcessCounters which tend to fail oddly and are not supported
everywhere.
2013-02-24 07:48:01 -08:00
Robert Adams 2aae046b95 Make StatsManager default output a little more readable 2013-02-24 07:48:01 -08:00
Robert Adams 9f213892ea Add EventHistogram.GetHistogramAsOSDMap that returns that parameters
about the histogram as well as the values.
2013-02-24 07:48:00 -08:00
Robert Adams ee8d726ec5 Modify StatsManager so console command "show stats category container"
only outputs the statistics in the specified container in the category.
2013-02-24 07:48:00 -08:00
Robert Adams 8e67ad25b0 Addition of ServerStats shared region module which collects and registers
server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
2013-02-24 07:47:59 -08:00
Diva Canto 6a01683aeb More clarification on the [Groups] section 2013-02-23 11:24:11 -08:00
Diva Canto a0161e7161 Further clarification on the same spot. 2013-02-23 11:21:14 -08:00
Diva Canto c72c238f5d Improved documentation of Groups section. 2013-02-23 11:16:50 -08:00
Diva Canto d7115cfd46 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-22 15:58:06 -08:00
Diva Canto 0e8289cd00 Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup] 2013-02-22 15:57:33 -08:00
Justin Clark-Casey (justincc) a93f06eb88 minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set only for region crossing and not teleport, etc. 2013-02-22 23:08:42 +00:00
Justin Clark-Casey (justincc) ccb7cce819 Make reset of EntityTransferStateMachine for an avatar transfer always 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.
2013-02-22 21:59:00 +00:00
Diva Canto 0d08f81421 Err.. wrong dll name for groups in Robust.HG.ini.example 2013-02-21 19:07:39 -08:00
Diva Canto 56c979afe8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-21 17:27:03 -08:00
Diva Canto 0e5859d2b4 Minor formatting cleanup. No changes. 2013-02-21 17:26:37 -08:00
Diva Canto e515cdddec Simplification of HG configs: HomeURI and GatekeeperURI now are defined as 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. 2013-02-21 17:26:19 -08:00
Robert Adams 76ee47c797 Add a virtual ToOSDMap() function to Monitoring.Stat for future
overloading by aggregation statistics and browser based stat viewers.
2013-02-21 15:53:04 -08:00
Robert Adams 303e21babe Add CounterStat which is a wrapper for a counter stat but, because
the 'count' event is internal, historical data can be built it.
Also includes EventHistogram class for building time based,
bucketed history of event occurances.
Make Stat implement IDisposable for subclasses that might need it.
2013-02-21 15:53:02 -08:00
Justin Clark-Casey (justincc) 9de670c550 minor: Change summary in "show appearance" console command to "incomplete" 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.
2013-02-21 23:08:50 +00:00
Robert Adams efb5da0aa6 BulletSim: add OutOfBounds logic and some position sanity checking
to eliminate some of the "cannot find terrain height" warning messages.
2013-02-21 08:52:11 -08:00
Robert Adams 681653ca13 Add a method to IStatsCollector for returning stats as an OSDMap.
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).
2013-02-20 16:13:51 -08:00
Robert Adams 16bb40229b Add flush after write feature to LogWriter 2013-02-20 16:13:49 -08:00
Justin Clark-Casey (justincc) 99ebff94b5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-20 22:11:04 +00:00
Justin Clark-Casey (justincc) a671c06ee5 Correct mistake in parsing 'show object pos' and similar pos commands where 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
2013-02-20 22:09:33 +00:00
Mic Bowman 903b40b47e Fix the JsonStore path set problem justincc found earlier today and
remove the deprecated TestPath functions.
2013-02-19 22:53:46 -08:00
Diva Canto 4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Diva Canto c5cbf862f9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-19 17:04:43 -08:00
Diva Canto 66bc526e4c Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed AssemblyFileVersionNumber too. 2013-02-19 17:04:21 -08:00
Justin Clark-Casey (justincc) 05a0998f57 Give the user some feedback about the success or failure of console login property commands 2013-02-20 00:51:55 +00:00
Justin Clark-Casey (justincc) db2b3627f2 Add information about MinLoginLevel to example ini files 2013-02-20 00:48:02 +00:00
Justin Clark-Casey (justincc) 8a6f2432fc minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll 2013-02-20 00:01:20 +00:00
Justin Clark-Casey (justincc) 26dca1adc3 Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead 2013-02-19 23:53:57 +00:00
Diva Canto 036d73c52a This should fix the build fail. Fingers crossed. 2013-02-19 07:55:20 -08:00
Diva Canto fc89987656 Previous build failed. Checking in a dummy change to see if the fail persists. 2013-02-19 07:30:55 -08:00
Diva Canto 9380d01976 First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll. 2013-02-19 07:26:40 -08:00
Diva Canto 46e182dbf5 Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. 2013-02-19 06:37:20 -08:00
Diva Canto 9e460f2af8 One more sql statement on migration #2 for offline im, to really clean up things. 2013-02-18 19:54:18 -08:00
Diva Canto 4e846d55a8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-02-18 16:06:01 -08:00
Diva Canto 5e709b087c Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll 2013-02-18 15:44:00 -08:00
Justin Clark-Casey (justincc) 050ef1dc4e minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others 2013-02-18 22:59:29 +00:00
Diva Canto 8b1b8a3921 I need these for OfflineIM and Groups. 2013-02-18 12:08:05 -08:00
Robert Adams 26421294f6 BulletSim: experimental lock axis code using constraints. Not enabled
by default. Like more debugging is needed.
2013-02-17 20:13:50 -08:00
Robert Adams 1d7276235a BulletSim: add calls for creating all the different Bullet constraint types.
Updated the DLLs and SOs and code for BulletXNA to create the types.
All the detailed control calls are not all in place yet.
2013-02-17 20:13:49 -08:00