diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 40 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientViewBase.cs | 5 |
2 files changed, 5 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; |
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs index 2cd730b..0b2c875 100644 --- a/OpenSim/Region/ClientStack/ClientViewBase.cs +++ b/OpenSim/Region/ClientStack/ClientViewBase.cs | |||
@@ -79,9 +79,14 @@ namespace OpenSim.Region.ClientStack | |||
79 | lock (SequenceLock) | 79 | lock (SequenceLock) |
80 | { | 80 | { |
81 | if (Sequence >= MAX_SEQUENCE) | 81 | if (Sequence >= MAX_SEQUENCE) |
82 | { | ||
82 | Sequence = 1; | 83 | Sequence = 1; |
84 | } | ||
83 | else | 85 | else |
86 | { | ||
84 | Sequence++; | 87 | Sequence++; |
88 | } | ||
89 | |||
85 | Pack.Header.Sequence = Sequence; | 90 | Pack.Header.Sequence = Sequence; |
86 | } | 91 | } |
87 | 92 | ||