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
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
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
c5cbf862f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-19 17:04:43 -08:00
66bc526e4c
Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed AssemblyFileVersionNumber too.
2013-02-19 17:04:21 -08:00
05a0998f57
Give the user some feedback about the success or failure of console login property commands
2013-02-20 00:51:55 +00:00
db2b3627f2
Add information about MinLoginLevel to example ini files
2013-02-20 00:48:02 +00:00
8a6f2432fc
minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll
2013-02-20 00:01:20 +00:00
26dca1adc3
Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead
2013-02-19 23:53:57 +00:00
036d73c52a
This should fix the build fail. Fingers crossed.
2013-02-19 07:55:20 -08:00
fc89987656
Previous build failed. Checking in a dummy change to see if the fail persists.
2013-02-19 07:30:55 -08:00
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
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
9e460f2af8
One more sql statement on migration #2 for offline im, to really clean up things.
2013-02-18 19:54:18 -08:00
4e846d55a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-18 16:06:01 -08:00
5e709b087c
Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll
2013-02-18 15:44:00 -08:00
050ef1dc4e
minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others
2013-02-18 22:59:29 +00:00
8c0b9080a4
Fix an issue where the viewer would request the seed cap before
...
there was a handler for it.
2013-02-18 21:09:14 +01:00
8b1b8a3921
I need these for OfflineIM and Groups.
2013-02-18 12:08:05 -08:00
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
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
885b45b112
BulletSim: rework parameter setting for different types of values
...
(like vectors or quaternions).
2013-02-17 20:13:48 -08:00
13fe3546c3
Correctly remove https:// URLs from the http server.
2013-02-17 17:43:32 +01:00
6560d80fa8
* Fix walking to <NaN, NaN, NaN> via autopilot.
2013-02-16 22:54:37 -05:00
e549c2922a
BulletSim: fix physical object appearing to slowly float off when
...
they stop moving.
2013-02-16 19:28:38 -08:00
3108d18ffb
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:44:41 +00:00
192e1e7cf0
Merge branch 'master' into careminster
2013-02-16 05:37:12 +00:00
4be35df5fa
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:09:27 +01:00
7d7736dc73
Separate IAR tests into separate files for load/save/loadpath tests
2013-02-16 01:57:42 +00:00
d54d31807a
Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.
...
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.
2013-02-16 00:50:52 +00:00
84de7e55e9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-16 00:27:16 +00:00
e9cc22fea4
Add regression test TestSaveNonRootFolderToIar
2013-02-16 00:26:21 +00:00
ea8c5ba707
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-15 21:42:16 +00:00
e09467b30d
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-02-14 20:06:22 -08:00
afeb5d4917
Use SortedDictionary in StatsManager instead of regular Dictionary so stats will interate and print in a defined order
2013-02-14 20:05:42 -08:00
8d5fe5c222
Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .).
...
Need to look further at other still commented tests.
Still need to check coverage against some of Mic's scripts.
2013-02-15 01:00:49 +00:00
61f18d15e1
Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJson()
...
This is because JsonGetJson() is getting json from anywhere in the structure, not just values.
Equally, JsonSetJson() is setting any type of json, not just json which represents a value.
Agreed with cmickeyb
2013-02-15 00:38:07 +00:00
0b2608d8f4
Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon
2013-02-15 00:32:20 +00:00
30a60d661f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-15 00:28:00 +00:00
Melanie