diff options
| author | Melanie | 2013-02-07 01:40:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 01:40:11 +0000 |
| commit | 375114bea37a017af553595d3a6f9d269acac1c5 (patch) | |
| tree | 41cdd67221bc0b1af5e6bd886338a0e90d2c856e /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.zip opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.gz opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.bz2 opensim-SC_OLD-375114bea37a017af553595d3a6f9d269acac1c5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 0bb4567..cc7885a 100644 --- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs | |||
| @@ -35,6 +35,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 35 | 35 | ||
| 36 | public interface IJsonStoreModule | 36 | public interface IJsonStoreModule |
| 37 | { | 37 | { |
| 38 | bool AttachObjectStore(UUID objectID); | ||
| 38 | bool CreateStore(string value, ref UUID result); | 39 | bool CreateStore(string value, ref UUID result); |
| 39 | bool DestroyStore(UUID storeID); | 40 | bool DestroyStore(UUID storeID); |
| 40 | bool TestStore(UUID storeID); | 41 | bool TestStore(UUID storeID); |