ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-02-15 21:42:16 +00:00
parent 945bf9808c e09467b30d
commit ea8c5ba707
13 changed files with 270 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
View File

@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Interfaces
bool CreateStore(string value, ref UUID result);
bool DestroyStore(UUID storeID);
JsonStoreNodeType PathType(UUID storeID, string path);
JsonStoreNodeType GetPathType(UUID storeID, string path);
bool TestStore(UUID storeID);
bool TestPath(UUID storeID, string path, bool useJson);
@@ -60,6 +60,6 @@ namespace OpenSim.Region.Framework.Interfaces
void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
int ArrayLength(UUID storeID, string path);
int GetArrayLength(UUID storeID, string path);
}
}