Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Mantis #6552 -- stricter error (crash) if server URL is malformed. | Diva Canto | 2013-02-25 | 1 | -5/+2 | |
| |/ / | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-25 | 5 | -218/+628 | |
| |\ \ | ||||||
| | * | | Add StatsManager registration for region specific stats as collected | Robert Adams | 2013-02-24 | 1 | -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 the | Robert Adams | 2013-02-24 | 1 | -160/+50 | |
| | | | | | | | | | | | | | | | | | | | | usage of ProcessCounters which tend to fail oddly and are not supported everywhere. | |||||
| | * | | Make StatsManager default output a little more readable | Robert Adams | 2013-02-24 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Add EventHistogram.GetHistogramAsOSDMap that returns that parameters | Robert Adams | 2013-02-24 | 1 | -211/+228 | |
| | | | | | | | | | | | | | | | | about the histogram as well as the values. | |||||
| | * | | Modify StatsManager so console command "show stats category container" | Robert Adams | 2013-02-24 | 1 | -5/+24 | |
| | | | | | | | | | | | | | | | | only outputs the statistics in the specified container in the category. | |||||
| | * | | Addition of ServerStats shared region module which collects and registers | Robert Adams | 2013-02-24 | 1 | -0/+438 | |
| | | | | | | | | | | | | | | | | server wide statistics (CPU%, network bytes sent, ...) with StatsManager. | |||||
| * | | | Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the ↵ | Diva Canto | 2013-02-25 | 4 | -3/+16 | |
| |/ / | | | | | | | | | | roles cache. | |||||
* | | | Make sure state machine is reset if crossing is aborted | Melanie | 2013-02-23 | 1 | -0/+6 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 15 | -60/+129 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-22 | 2 | -42/+87 | |
| |\ \ | ||||||
| | * | | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵ | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -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-22 | 1 | -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 Canto | 2013-02-22 | 13 | -15/+54 | |
| |/ / | | | | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup] | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 132 | -711/+11859 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-21 | 4 | -3/+236 | |
| |\ \ | ||||||
| | * | | Add a virtual ToOSDMap() function to Monitoring.Stat for future | Robert Adams | 2013-02-21 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | overloading by aggregation statistics and browser based stat viewers. | |||||
| | * | | Add CounterStat which is a wrapper for a counter stat but, because | Robert Adams | 2013-02-21 | 2 | -1/+218 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | minor: Change summary in "show appearance" console command to "incomplete" ↵ | Justin Clark-Casey (justincc) | 2013-02-21 | 2 | -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 Canto | 2013-02-21 | 13 | -37/+79 | |
| |/ / | | | | | | | | | | 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 checking | Robert Adams | 2013-02-21 | 5 | -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 Adams | 2013-02-20 | 6 | -4/+82 | |
| | | | | | | | | | | | | | | | | | | 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 LogWriter | Robert Adams | 2013-02-20 | 1 | -1/+12 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-20 | 61 | -155/+58 | |
| |\ \ | ||||||
| | * | | Fix the JsonStore path set problem justincc found earlier today and | Mic Bowman | 2013-02-19 | 4 | -96/+3 | |
| | | | | | | | | | | | | | | | | remove the deprecated TestPath functions. | |||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 55 | -55/+53 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-19 | 4 | -17/+28 | |
| | |\ \ | ||||||
| | * | | | Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed ↵ | Diva Canto | 2013-02-19 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | AssemblyFileVersionNumber too. | |||||
| * | | | | Correct mistake in parsing 'show object pos' and similar pos commands where ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -9/+9 | |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Give the user some feedback about the success or failure of console login ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | property commands | |||||
| * | | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | |||||
| * | | | Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead | Justin Clark-Casey (justincc) | 2013-02-19 | 1 | -10/+10 | |
| |/ / | ||||||
| * | | First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵ | Diva Canto | 2013-02-19 | 20 | -0/+9455 | |
| | | | | | | | | | | | | rest to Addons.Groups.dll. | |||||
| * | | Offline IM: moved the Data and MySQL bits to the corresponding places in ↵ | Diva Canto | 2013-02-19 | 3 | -8/+2 | |
| | | | | | | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. | |||||
| * | | One more sql statement on migration #2 for offline im, to really clean up ↵ | Diva Canto | 2013-02-18 | 1 | -0/+1 | |
| | | | | | | | | | | | | things. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-18 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | minor: Rename regression test method TestGetArrayLength() -> ↵ | Justin Clark-Casey (justincc) | 2013-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | JsonTestGetArrayLength() to match others | |||||
| * | | | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll | Diva Canto | 2013-02-18 | 9 | -0/+1016 | |
| | | | | ||||||
| * | | | I need these for OfflineIM and Groups. | Diva Canto | 2013-02-18 | 1 | -0/+60 | |
| |/ / | ||||||
| * | | BulletSim: experimental lock axis code using constraints. Not enabled | Robert Adams | 2013-02-17 | 2 | -22/+74 | |
| | | | | | | | | | | | | by default. Like more debugging is needed. | |||||
| * | | BulletSim: add calls for creating all the different Bullet constraint types. | Robert Adams | 2013-02-17 | 5 | -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 values | Robert Adams | 2013-02-17 | 5 | -394/+348 | |
| | | | | | | | | | | | | (like vectors or quaternions). | |||||
| * | | * Fix walking to <NaN, NaN, NaN> via autopilot. | teravus | 2013-02-16 | 1 | -1/+5 | |
| | | | ||||||
| * | | BulletSim: fix physical object appearing to slowly float off when | Robert Adams | 2013-02-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | they stop moving. | |||||
| * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 12 | -298/+533 | |
|\ \ \ | |/ / | ||||||
| * | | Separate IAR tests into separate files for load/save/loadpath tests | Justin Clark-Casey (justincc) | 2013-02-16 | 3 | -245/+198 | |
| | | | ||||||
| * | | Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder. | Justin Clark-Casey (justincc) | 2013-02-16 | 2 | -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. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-02-16 | 2 | -22/+22 | |
| |\ \ |