| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 22 | -221/+314 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Improve description of GenerateMapTiles config option | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -7/+8 |
| | | | |||||
| | * | Add documentation on default or Warp3D image module choice to ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission. | ||||
| | * | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 14 | -212/+245 |
| | | | | | | | | | places where we were not already. | ||||
| | * | minor: Remove unnecessary very old System.Net reference in ↵ | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -1/+0 |
| | | | | | | | | | OpenSim.Region.ScriptEngine.Shared | ||||
| | * | minor: remove warning in ConfigurationLoaderTest | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+2 |
| | | | |||||
| | * | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 5 | -22/+86 |
| | | | |||||
| | * | BulletSim: fix crash around race condition when a mesh asset cannot | Robert Adams | 2013-02-26 | 2 | -8/+12 |
| | | | | | | | | | | | be fetched. Update TODO list. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 19 | -321/+762 |
| |\ \ | |/ | |||||
| | * | BulletSim: tweeks to make avatar jump work better. | Robert Adams | 2013-02-25 | 1 | -4/+6 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-02-25 | 8 | -91/+109 |
| | |\ | |||||
| | | * | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 8 | -91/+109 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | 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. | ||||
| | * | | Missing var in [LoginService] for HG Robust. | Diva Canto | 2013-02-25 | 1 | -0/+1 |
| | | | | |||||
| | * | | 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 | 18 | -63/+140 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | More clarification on the [Groups] section | Diva Canto | 2013-02-23 | 1 | -0/+1 |
| | | | |||||
| | * | Further clarification on the same spot. | Diva Canto | 2013-02-23 | 1 | -0/+1 |
| | | | |||||
| | * | Improved documentation of Groups section. | Diva Canto | 2013-02-23 | 1 | -2/+6 |
| | | | |||||
| | * | 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] | ||||
| | * | Err.. wrong dll name for groups in Robust.HG.ini.example | Diva Canto | 2013-02-21 | 2 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 141 | -780/+12111 |
| |\ \ | |/ | |||||
| | * | 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. | ||||
| | * | | Minor formatting cleanup. No changes. | Diva Canto | 2013-02-21 | 1 | -12/+12 |
| | | | | |||||
| | * | | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵ | Diva Canto | 2013-02-21 | 16 | -67/+153 |
| | |/ | | | | | | | 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 | 6 | -18/+39 |
| | | |\ | |||||
| | | * | | 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 | ||||
| | * | | Add information about MinLoginLevel to example ini files | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -1/+11 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |