aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorlbsa712007-08-08 21:23:42 +0000
committerlbsa712007-08-08 21:23:42 +0000
commit25a67916277b1417bca16c3427fdabdb1ce9e1f4 (patch)
treeda7efaa27284610f267e4f07ca374dbc2944faac /OpenSim/Grid
parentworldmap now gets correctly updated when terrain changes (diff)
downloadopensim-SC-25a67916277b1417bca16c3427fdabdb1ce9e1f4.zip
opensim-SC-25a67916277b1417bca16c3427fdabdb1ce9e1f4.tar.gz
opensim-SC-25a67916277b1417bca16c3427fdabdb1ce9e1f4.tar.bz2
opensim-SC-25a67916277b1417bca16c3427fdabdb1ce9e1f4.tar.xz
* Checked in new tweaked Prebuild.exe
* Ignored binaries
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs40
1 files changed, 0 insertions, 40 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index b581a1e..eabaebc 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -91,50 +91,10 @@ namespace OpenSim.Grid.AssetServer
91 httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); 91 httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
92 httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); 92 httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
93 93
94 //httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
95 //httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
96
97 httpServer.Start(); 94 httpServer.Start();
98 95
99 } 96 }
100 97
101 //public string AssetPostMethod(string requestBody, string path, string param)
102 //{
103 // AssetBase asset = new AssetBase();
104 // asset.Name = "";
105 // asset.FullID = new LLUUID(param);
106 // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
107 // byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
108 // asset.Data = buffer;
109 // AssetStorage store = new AssetStorage();
110 // store.Data = asset.Data;
111 // store.Name = asset.Name;
112 // store.UUID = asset.FullID;
113 // db.Set(store);
114 // db.Commit();
115 // return "";
116 //}
117
118 //public string AssetGetMethod(string request, string path, string param)
119 //{
120 // Console.WriteLine("got a request " + param);
121 // byte[] assetdata = GetAssetData(new LLUUID(param), false);
122 // if (assetdata != null)
123 // {
124 // Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
125 // string ret = Windows1252Encoding.GetString(assetdata);
126 // //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
127
128 // return ret;
129
130 // }
131 // else
132 // {
133 // return "";
134 // }
135
136 //}
137
138 public byte[] GetAssetData(LLUUID assetID, bool isTexture) 98 public byte[] GetAssetData(LLUUID assetID, bool isTexture)
139 { 99 {
140 bool found = false; 100 bool found = false;