aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-31 14:19:40 +0000
committerJustin Clarke Casey2008-03-31 14:19:40 +0000
commitd53dd8a7cc883baf611e480d538f7a9d240681b3 (patch)
tree9e56fb877e8edc8c34623567867171f6e9fe13b1
parentModify NAnt target in Prebuild to copy .mdb files to bin in debug configurati... (diff)
downloadopensim-SC_OLD-d53dd8a7cc883baf611e480d538f7a9d240681b3.zip
opensim-SC_OLD-d53dd8a7cc883baf611e480d538f7a9d240681b3.tar.gz
opensim-SC_OLD-d53dd8a7cc883baf611e480d538f7a9d240681b3.tar.bz2
opensim-SC_OLD-d53dd8a7cc883baf611e480d538f7a9d240681b3.tar.xz
* Minor change on region grid asset client to change two store log messages to one
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index b952af2..3e703d2 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -94,19 +94,22 @@ namespace OpenSim.Framework.Communications.Cache
94 // XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); 94 // XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
95 // xs.Serialize(s, asset); 95 // xs.Serialize(s, asset);
96 // RestClient rc = new RestClient(_assetServerUrl); 96 // RestClient rc = new RestClient(_assetServerUrl);
97 m_log.Info("[GRID ASSET CLIENT]: Storing asset"); 97
98 string assetUrl = _assetServerUrl + "/assets/";
99
98 //rc.AddResourcePath("assets"); 100 //rc.AddResourcePath("assets");
99 101
100 // rc.RequestMethod = "POST"; 102 // rc.RequestMethod = "POST";
101 // rc.Request(s); 103 // rc.Request(s);
102 //m_log.InfoFormat("[ASSET]: Stored {0}", rc); 104 //m_log.InfoFormat("[ASSET]: Stored {0}", rc);
103 m_log.Info("[GRID ASSET CLIENT]: Sending to " + _assetServerUrl + "/assets/");
104 RestObjectPoster.BeginPostObject<AssetBase>(_assetServerUrl + "/assets/", asset);
105 105
106 m_log.InfoFormat("[GRID ASSET CLIENT]: Sending store request for asset {0}", asset.FullID);
107
108 RestObjectPoster.BeginPostObject<AssetBase>(assetUrl, asset);
106 } 109 }
107 catch (Exception e) 110 catch (Exception e)
108 { 111 {
109 m_log.Error("[GRID ASSET CLIENT]: " + e.Message); 112 m_log.ErrorFormat("[GRID ASSET CLIENT]: {0}", e);
110 } 113 }
111 } 114 }
112 115