ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,129 Commits 5 Branches 88 Tags
4bf9c4bbb833f8ecbd0757b333da76ffaea14bc7
Commit Graph

1172 Commits

Author SHA1 Message Date
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
Melanie
68b910c1ff Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-03-22 01:01:24 +00:00
Justin Clark-Casey (justincc)
c0ff5635ba Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013) 
This break was not connected with the recent attachment code changes.
 2013-03-20 02:00:56 +00:00
Melanie
5e1f651e21 Merge branch 'master' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:31:27 +00:00
Melanie
fcecfc81bb Multiattach, part 1 
Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-18 22:56:03 +00:00
Melanie
b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Robert Adams
c10c43d6f6 Fix server statistics always reporting zero for total network bytes in/out. 
Clean up some parameter code in Statistics.Binary.
 2013-03-15 13:59:34 -07:00
Melanie
70f0587558 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-08 01:07:05 +00:00
Mic Bowman
9875e840f7 Per discussions with justincc... split the JsonStore type 
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
 2013-03-05 20:33:17 -08:00
Melanie
339d8ef2a6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-06 00:15:54 +00:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-05 23:57:53 +00:00
Melanie
797bfbfcfa Multiattach, part 1 2013-03-05 12:02:22 +01:00
Diva Canto
e70c71a175 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-02 17:54:19 -08:00
Diva Canto
b0985f7019 Fixed typos in TempAttachmentsModule. No changes. 2013-03-02 17:53:57 -08:00
Justin Clark-Casey (justincc)
1a98ce5f64 minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions 2013-03-02 01:06:08 +00:00
Melanie
a675f7d4c3 Merge branch 'master' into careminster 2013-03-01 23:54:00 +00:00
Diva Canto
20530ee667 Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon. 2013-03-01 15:24:22 -08:00
Justin Clark-Casey (justincc)
c851ebcd8c Add the Mono AddinDependency attribute to the example region modules. 
It turns out this is required to get Mono.Addins to pick up plugin DLLs
 2013-03-01 21:47:17 +00:00
Melanie
eb9458fd7e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2013-02-28 21:20:07 +00: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
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
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
Melanie
54ee95dd8e Merge branch 'master' into careminster 2013-02-26 13:34:20 +00: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
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
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
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Justin Clark-Casey (justincc)
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
Mic Bowman
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
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Justin Clark-Casey (justincc)
26dca1adc3 Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead 2013-02-19 23:53:57 +00:00
Justin Clark-Casey (justincc)
050ef1dc4e minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others 2013-02-18 22:59:29 +00:00
Melanie
ea8c5ba707 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-15 21:42:16 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
0b2608d8f4 Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon 2013-02-15 00:32:20 +00:00
Justin Clark-Casey (justincc)
cc40517863 Add regression TestJsonList2Path() 2013-02-15 00:27:30 +00:00
Justin Clark-Casey (justincc)
13d4f6f747 Add regression TestGetArrayLength() 2013-02-14 21:34:57 +00:00
Justin Clark-Casey (justincc)
6fe771f27e Add regression TestJsonGetPathType() 2013-02-14 21:31:34 +00:00
Justin Clark-Casey (justincc)
edb99dcc19 Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength() 
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
 2013-02-14 21:11:58 +00:00
Justin Clark-Casey (justincc)
a52dfd43b6 Make new JsonStore script constants separated with underscores, to be consistent with existing LSL/OSSL, etc script constants. 
Agreed with cmickeyb
 2013-02-14 21:03:07 +00:00
Melanie
9d55a2298d Merge branch 'master' into careminster 2013-02-14 07:45:23 +00:00
Mic Bowman
bcb172301d Adds a couple requested functions to the JsonStore script 
interface. JsonPathType returns the type of node pointed to by the
path and deprecates the functionality of both JsonTestPath
functions. JsonArrayLength returns the length of an array node.
 2013-02-13 07:14:04 -08:00
Mic Bowman
708c3f8b86 Make path parsing more robust in the JsonStore. 2013-02-12 23:21:49 -08:00
Melanie
d0c5e0990b Merge branch 'master' into careminster 2013-02-13 01:54:06 +00:00
Justin Clark-Casey (justincc)
5557b523fd Add more sub-tests to TestJsonSetValue for paths containing []{} without {} delineation. 
As expected, values are not set and the set call returns FALSE (0).
As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
 2013-02-13 01:38:33 +00:00
Justin Clark-Casey (justincc)
b1a165a39a Extend JsonTestSetValue() with tests for escaping brackets, periods and unbalanced braces from paths 
The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
 2013-02-13 01:25:30 +00:00
Justin Clark-Casey (justincc)
70e641c708 Add test for array as root element in TestJsonCreateStore() 2013-02-13 00:51:45 +00:00
Justin Clark-Casey (justincc)
4b797f2ead Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays 2013-02-13 00:12:20 +00:00