Justin Clark-Casey (justincc)
14684116f8
Add regression tests for llGetNotecardLine()
2013-02-28 20:57:03 +00:00
Diva Canto
9e0c678c1e
Robust.HG.ini.example updated to get an [Hypergrid] section too.
2013-02-28 06:24:09 -08:00
Diva Canto
3cc3a8e5bf
Removed duplicate 'using' statement.
2013-02-27 21:12:27 -08:00
Diva Canto
bb44758179
Switched to using the other Util function with a default value.
2013-02-27 20:59:16 -08:00
Diva Canto
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
Diva Canto
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
Justin Clark-Casey (justincc)
b892411575
Add comment to example region modules about need to add Assembly annotation if adding modules to a DLL which does not already have this
2013-02-27 22:54:51 +00:00
Justin Clark-Casey (justincc)
0e8ec5649e
Get "show modules" console command to obey selected command line region/s
2013-02-27 22:32:14 +00:00
Justin Clark-Casey (justincc)
647cb278c7
Get "show modules" console command to show modules in alphabetical order, and group shared and non-shared modules together
...
This is to make it easier to tell if a region has a certain module active or not
2013-02-27 22:25:03 +00:00
Justin Clark-Casey (justincc)
1bef19b914
Do not have the Freeswitch connector on by default in Robust ini example files.
...
This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch)
and requires a complicated Freeswitch setup.
Having it on but not configured results in spurious warnings in the logs
2013-02-27 21:45:31 +00:00
Justin Clark-Casey (justincc)
9b045e72b6
Add asset name and description truncation warnings to SQLite database plugin for consistency.
2013-02-27 21:41:21 +00:00
Justin Clark-Casey (justincc)
74916ed777
Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
...
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
2013-02-27 21:35:54 +00:00
Melanie
ba0819be9e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-02-27 20:40:48 +00:00
Justin Clark-Casey (justincc)
61ba02e95f
minor: remove some mono compiler warnings in script regression tests
2013-02-27 20:38:10 +00:00
Justin Clark-Casey (justincc)
056f11c297
Show http poll handlers in separate http (poll) section of "show http-handlers" console command instead of never showing them (due to a previous bug).
...
The code was assuming that poll handlers were also included in general http handlers but this was not the case.
2013-02-27 20:33:11 +00:00
Justin Clark-Casey (justincc)
59bd099b03
Add regression test for llReleaseUrl() (and for llRequestUrl)
...
Forgot to add file for llRequestUrl() test in commit b8a7c8b
2013-02-27 20:12:58 +00:00
Melanie
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Melanie
adf03ad2e5
Reinstate uploading temporary textures
2013-02-27 18:43:51 +01:00
Melanie
698363990b
Try to update inventory items when there is a valid asset - may fix temp textures
2013-02-27 18:19:38 +01:00
Justin Clark-Casey (justincc)
20760fde25
Improve description of GenerateMapTiles config option
2013-02-27 00:31:54 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
2bfbfc5725
minor: Remove unnecessary very old System.Net reference in OpenSim.Region.ScriptEngine.Shared
2013-02-26 23:43:06 +00:00
Justin Clark-Casey (justincc)
ea4be309e8
minor: remove warning in ConfigurationLoaderTest
2013-02-26 23:40:55 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
Robert Adams
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
Melanie
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
Robert Adams
2b53f08386
BulletSim: tweeks to make avatar jump work better.
2013-02-25 21:58:00 -08:00
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
root
d7c742a5f9
Remove osParseJSONNew because it's "object" return type is not useful for LSL
2013-02-25 23:01:03 +01: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
Melanie
da2b598484
Make banking no longer break sit rotations. Fix spinning avatars.
2013-02-25 18:26:59 +01:00
Melanie
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
Melanie
79e477f6af
Output some additional data on Vivox connection errors
2013-02-24 18:32:11 +01:00
Melanie
e0e9118f81
The viewer tries to parse the error message body to LLSD - give it some.
2013-02-24 18:31:49 +01: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
Melanie
405da93589
Revert "Allow TeleportCancel packets to reset the transfer state machine"
...
This reverts commit 0e17887e03
.
2013-02-24 00:38:57 +01:00
Melanie
ee18db027c
Make sure state machine is reset if crossing is aborted
2013-02-23 21:00:05 +00:00
Melanie
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00: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