698363990b
Try to update inventory items when there is a valid asset - may fix temp textures
2013-02-27 18:19:38 +01:00
20760fde25
Improve description of GenerateMapTiles config option
2013-02-27 00:31:54 +00:00
917c1695a1
Add documentation on default or Warp3D image module choice to OpenSim.ini.example.
...
As before, default is MapImageModule.
Thanks to Ai Austin for pointing out this omission.
2013-02-27 00:27:21 +00:00
80c19b7cac
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
2bfbfc5725
minor: Remove unnecessary very old System.Net reference in OpenSim.Region.ScriptEngine.Shared
2013-02-26 23:43:06 +00:00
ea4be309e8
minor: remove warning in ConfigurationLoaderTest
2013-02-26 23:40:55 +00:00
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
bf9132e1c7
BulletSim: fix crash around race condition when a mesh asset cannot
...
be fetched.
Update TODO list.
2013-02-26 11:32:01 -08:00
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
2b53f08386
BulletSim: tweeks to make avatar jump work better.
2013-02-25 21:58:00 -08:00
a356978c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-25 16:28:12 -08:00
00da59ae52
Mantis #6552 -- stricter error (crash) if server URL is malformed.
2013-02-25 16:27:41 -08:00
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
d7c742a5f9
Remove osParseJSONNew because it's "object" return type is not useful for LSL
2013-02-25 23:01:03 +01:00
66c5934d90
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-25 10:25:56 -08:00
53470d5057
Missing var in [LoginService] for HG Robust.
2013-02-25 10:25:36 -08:00
f7aa018a78
Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles cache.
2013-02-25 10:24:28 -08:00
da2b598484
Make banking no longer break sit rotations. Fix spinning avatars.
2013-02-25 18:26:59 +01:00
f4e12c5f72
Revert "Output some additional data on Vivox connection errors", this logs passwords! Bad!
...
This reverts commit 79e477f6af
2013-02-24 18:33:47 +01:00
79e477f6af
Output some additional data on Vivox connection errors
2013-02-24 18:32:11 +01:00
e0e9118f81
The viewer tries to parse the error message body to LLSD - give it some.
2013-02-24 18:31:49 +01:00
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
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
2aae046b95
Make StatsManager default output a little more readable
2013-02-24 07:48:01 -08:00
9f213892ea
Add EventHistogram.GetHistogramAsOSDMap that returns that parameters
...
about the histogram as well as the values.
2013-02-24 07:48:00 -08:00
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
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
405da93589
Revert "Allow TeleportCancel packets to reset the transfer state machine"
...
This reverts commit 0e17887e03
2013-02-24 00:38:57 +01:00
ee18db027c
Make sure state machine is reset if crossing is aborted
2013-02-23 21:00:05 +00:00
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00:00
6a01683aeb
More clarification on the [Groups] section
2013-02-23 11:24:11 -08:00
a0161e7161
Further clarification on the same spot.
2013-02-23 11:21:14 -08:00
c72c238f5d
Improved documentation of Groups section.
2013-02-23 11:16:50 -08:00
d7115cfd46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-22 15:58:06 -08:00
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
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
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
0d08f81421
Err.. wrong dll name for groups in Robust.HG.ini.example
2013-02-21 19:07:39 -08:00
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
56c979afe8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-21 17:27:03 -08:00
0e5859d2b4
Minor formatting cleanup. No changes.
2013-02-21 17:26:37 -08:00
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
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
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
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
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
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
16bb40229b
Add flush after write feature to LogWriter
2013-02-20 16:13:49 -08:00
99ebff94b5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-20 22:11:04 +00:00
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
Melanie