diff options
| author | Melanie | 2013-02-15 21:42:16 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-15 21:42:16 +0000 |
| commit | ea8c5ba707f0c6afd98968b68d13ab03b151b75b (patch) | |
| tree | 9b67be5dd03a8012fb832590b05c550f869601fa /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.zip opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.gz opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.bz2 opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs index d7907e3..b40d24f 100644 --- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | |||
| @@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 49 | bool CreateStore(string value, ref UUID result); | 49 | bool CreateStore(string value, ref UUID result); |
| 50 | bool DestroyStore(UUID storeID); | 50 | bool DestroyStore(UUID storeID); |
| 51 | 51 | ||
| 52 | JsonStoreNodeType PathType(UUID storeID, string path); | 52 | JsonStoreNodeType GetPathType(UUID storeID, string path); |
| 53 | bool TestStore(UUID storeID); | 53 | bool TestStore(UUID storeID); |
| 54 | bool TestPath(UUID storeID, string path, bool useJson); | 54 | bool TestPath(UUID storeID, string path, bool useJson); |
| 55 | 55 | ||
| @@ -60,6 +60,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 60 | void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); | 60 | void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); |
| 61 | void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); | 61 | void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); |
| 62 | 62 | ||
| 63 | int ArrayLength(UUID storeID, string path); | 63 | int GetArrayLength(UUID storeID, string path); |
| 64 | } | 64 | } |
| 65 | } | 65 | } |