diff options
| author | Melanie | 2013-01-31 02:53:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 02:53:11 +0000 |
| commit | 9a4de546fe92105c570d6861377ec47d32b4186e (patch) | |
| tree | edfb86074fc7c78126203a2c05a38e260c0d4076 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add JsonTestStore to determine if a JsonStore is associated with (diff) | |
| download | opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.zip opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2 opensim-SC-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs index da39e95..0bb4567 100644 --- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | |||
| @@ -37,6 +37,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 37 | { | 37 | { |
| 38 | bool CreateStore(string value, ref UUID result); | 38 | bool CreateStore(string value, ref UUID result); |
| 39 | bool DestroyStore(UUID storeID); | 39 | bool DestroyStore(UUID storeID); |
| 40 | bool TestStore(UUID storeID); | ||
| 40 | bool TestPath(UUID storeID, string path, bool useJson); | 41 | bool TestPath(UUID storeID, string path, bool useJson); |
| 41 | bool SetValue(UUID storeID, string path, string value, bool useJson); | 42 | bool SetValue(UUID storeID, string path, string value, bool useJson); |
| 42 | bool RemoveValue(UUID storeID, string path); | 43 | bool RemoveValue(UUID storeID, string path); |