diff options
author | Adam Frisby | 2007-07-13 19:00:10 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-13 19:00:10 +0000 |
commit | 41cd6cdfdd2d5fcf48a06c76a2eac315303fa746 (patch) | |
tree | deb5b50b360dfb249211da8f6ecce74c4f45b1ce | |
parent | * I want to commit too! (diff) | |
download | opensim-SC_OLD-41cd6cdfdd2d5fcf48a06c76a2eac315303fa746.zip opensim-SC_OLD-41cd6cdfdd2d5fcf48a06c76a2eac315303fa746.tar.gz opensim-SC_OLD-41cd6cdfdd2d5fcf48a06c76a2eac315303fa746.tar.bz2 opensim-SC_OLD-41cd6cdfdd2d5fcf48a06c76a2eac315303fa746.tar.xz |
* Fixed bug reported by xyzo - region assets are now stored in "regionassets.yap", asset server assets are now in "gridassets.yap"
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 3e302d8..4126ff4 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -154,10 +154,10 @@ namespace OpenSim.Grid.AssetServer | |||
154 | 154 | ||
155 | public void setupDB() | 155 | public void setupDB() |
156 | { | 156 | { |
157 | bool yapfile = File.Exists("assets.yap"); | 157 | bool yapfile = File.Exists("gridassets.yap"); |
158 | try | 158 | try |
159 | { | 159 | { |
160 | db = Db4oFactory.OpenFile("assets.yap"); | 160 | db = Db4oFactory.OpenFile("gridassets.yap"); |
161 | MainLog.Instance.Verbose("Main.cs:setupDB() - creation"); | 161 | MainLog.Instance.Verbose("Main.cs:setupDB() - creation"); |
162 | } | 162 | } |
163 | catch (Exception e) | 163 | catch (Exception e) |
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs index 54d43a1..1023820 100644 --- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs | |||
@@ -62,12 +62,12 @@ namespace OpenSim.Region.GridInterfaces.Local | |||
62 | { | 62 | { |
63 | bool yapfile; | 63 | bool yapfile; |
64 | this._assetRequests = new BlockingQueue<ARequest>(); | 64 | this._assetRequests = new BlockingQueue<ARequest>(); |
65 | yapfile = File.Exists("assets.yap"); | 65 | yapfile = File.Exists("regionassets.yap"); |
66 | 66 | ||
67 | MainLog.Instance.Verbose( "Local Asset Server class created"); | 67 | MainLog.Instance.Verbose( "Local Asset Server class created"); |
68 | try | 68 | try |
69 | { | 69 | { |
70 | db = Db4oFactory.OpenFile("assets.yap"); | 70 | db = Db4oFactory.OpenFile("regionassets.yap"); |
71 | MainLog.Instance.Verbose( "Db4 Asset database creation"); | 71 | MainLog.Instance.Verbose( "Db4 Asset database creation"); |
72 | } | 72 | } |
73 | catch (Exception e) | 73 | catch (Exception e) |