diff options
author | Adam Frisby | 2008-04-30 23:11:07 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-30 23:11:07 +0000 |
commit | 25a49ac4de056f43d6c5803fcd34804fcea96ae2 (patch) | |
tree | 3b3f24601da9ebdcc8818b86fe201da2c63d7dda /OpenSim | |
parent | * Fix #3 (diff) | |
download | opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.zip opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.gz opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.bz2 opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.xz |
* Spring cleaned a bunch of '//TODO: unused' marked functions.
Diffstat (limited to 'OpenSim')
12 files changed, 0 insertions, 414 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 6b3b8ef..dd3d20e 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -1350,14 +1350,6 @@ namespace OpenSim.Data.MSSQL | |||
1350 | return param; | 1350 | return param; |
1351 | } | 1351 | } |
1352 | 1352 | ||
1353 | // TODO: unused | ||
1354 | // private SqlParameter createParamWithValue(string name, Type type, Object o) | ||
1355 | // { | ||
1356 | // SqlParameter param = createSqlParameter(name, type); | ||
1357 | // param.Value = o; | ||
1358 | // return param; | ||
1359 | // } | ||
1360 | |||
1361 | private void setupPrimCommands(SqlDataAdapter da, SqlConnection conn) | 1353 | private void setupPrimCommands(SqlDataAdapter da, SqlConnection conn) |
1362 | { | 1354 | { |
1363 | da.InsertCommand = createInsertCommand("prims", m_dataSet.Tables["prims"]); | 1355 | da.InsertCommand = createInsertCommand("prims", m_dataSet.Tables["prims"]); |
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index d438064..1f9ea70 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -586,40 +586,6 @@ namespace OpenSim.Data.MySQL | |||
586 | return landDataForRegion; | 586 | return landDataForRegion; |
587 | } | 587 | } |
588 | 588 | ||
589 | // TODO: unused | ||
590 | // private void DisplayDataSet(DataSet ds, string title) | ||
591 | // { | ||
592 | // Debug.WriteLine(title); | ||
593 | // //--- Loop through the DataTables | ||
594 | // foreach (DataTable table in ds.Tables) | ||
595 | // { | ||
596 | // Debug.WriteLine("*** DataTable: " + table.TableName + "***"); | ||
597 | // //--- Loop through each DataTable's DataRows | ||
598 | // foreach (DataRow row in table.Rows) | ||
599 | // { | ||
600 | // //--- Display the original values, if there are any. | ||
601 | // if (row.HasVersion(DataRowVersion.Original)) | ||
602 | // { | ||
603 | // Debug.Write("Original Row Values ===> "); | ||
604 | // foreach (DataColumn column in table.Columns) | ||
605 | // Debug.Write(column.ColumnName + " = " + | ||
606 | // row[column, DataRowVersion.Original] + ", "); | ||
607 | // Debug.WriteLine(String.Empty); | ||
608 | // } | ||
609 | // //--- Display the current values, if there are any. | ||
610 | // if (row.HasVersion(DataRowVersion.Current)) | ||
611 | // { | ||
612 | // Debug.Write("Current Row Values ====> "); | ||
613 | // foreach (DataColumn column in table.Columns) | ||
614 | // Debug.Write(column.ColumnName + " = " + | ||
615 | // row[column, DataRowVersion.Current] + ", "); | ||
616 | // Debug.WriteLine(String.Empty); | ||
617 | // } | ||
618 | // Debug.WriteLine(String.Empty); | ||
619 | // } | ||
620 | // } | ||
621 | // } | ||
622 | |||
623 | public void Commit() | 589 | public void Commit() |
624 | { | 590 | { |
625 | if (m_connection.State != ConnectionState.Open) | 591 | if (m_connection.State != ConnectionState.Open) |
@@ -1515,14 +1481,6 @@ namespace OpenSim.Data.MySQL | |||
1515 | return param; | 1481 | return param; |
1516 | } | 1482 | } |
1517 | 1483 | ||
1518 | // TODO: unused | ||
1519 | // private MySqlParameter createParamWithValue(string name, Type type, Object o) | ||
1520 | // { | ||
1521 | // MySqlParameter param = createMySqlParameter(name, type); | ||
1522 | // param.Value = o; | ||
1523 | // return param; | ||
1524 | // } | ||
1525 | |||
1526 | private void SetupPrimCommands(MySqlDataAdapter da, MySqlConnection conn) | 1484 | private void SetupPrimCommands(MySqlDataAdapter da, MySqlConnection conn) |
1527 | { | 1485 | { |
1528 | MySqlCommand insertCommand = createInsertCommand("prims", m_primTable); | 1486 | MySqlCommand insertCommand = createInsertCommand("prims", m_primTable); |
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index 66ce6ab..e1d2cdf 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs | |||
@@ -92,75 +92,6 @@ namespace OpenSim.Data.SQLite | |||
92 | return (IDbCommand) dbcommand; | 92 | return (IDbCommand) dbcommand; |
93 | } | 93 | } |
94 | 94 | ||
95 | // TODO: unused | ||
96 | // private bool TestTables(SQLiteConnection conn) | ||
97 | // { | ||
98 | // SQLiteCommand cmd = new SQLiteCommand("SELECT * FROM regions", conn); | ||
99 | // SQLiteDataAdapter pDa = new SQLiteDataAdapter(cmd); | ||
100 | // DataSet tmpDS = new DataSet(); | ||
101 | // try | ||
102 | // { | ||
103 | // pDa.Fill(tmpDS, "regions"); | ||
104 | // } | ||
105 | // catch (SqliteSyntaxException) | ||
106 | // { | ||
107 | // m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); | ||
108 | // InitDB(conn); | ||
109 | // } | ||
110 | // return true; | ||
111 | // } | ||
112 | |||
113 | // TODO: unused | ||
114 | // private DataTable createRegionsTable() | ||
115 | // { | ||
116 | // DataTable regions = new DataTable("regions"); | ||
117 | |||
118 | // createCol(regions, "regionHandle", typeof (ulong)); | ||
119 | // createCol(regions, "regionName", typeof (String)); | ||
120 | // createCol(regions, "uuid", typeof (String)); | ||
121 | |||
122 | // createCol(regions, "regionRecvKey", typeof (String)); | ||
123 | // createCol(regions, "regionSecret", typeof (String)); | ||
124 | // createCol(regions, "regionSendKey", typeof (String)); | ||
125 | |||
126 | // createCol(regions, "regionDataURI", typeof (String)); | ||
127 | // createCol(regions, "serverIP", typeof (String)); | ||
128 | // createCol(regions, "serverPort", typeof (String)); | ||
129 | // createCol(regions, "serverURI", typeof (String)); | ||
130 | |||
131 | |||
132 | // createCol(regions, "locX", typeof (uint)); | ||
133 | // createCol(regions, "locY", typeof (uint)); | ||
134 | // createCol(regions, "locZ", typeof (uint)); | ||
135 | |||
136 | // createCol(regions, "eastOverrideHandle", typeof (ulong)); | ||
137 | // createCol(regions, "westOverrideHandle", typeof (ulong)); | ||
138 | // createCol(regions, "southOverrideHandle", typeof (ulong)); | ||
139 | // createCol(regions, "northOverrideHandle", typeof (ulong)); | ||
140 | |||
141 | // createCol(regions, "regionAssetURI", typeof (String)); | ||
142 | // createCol(regions, "regionAssetRecvKey", typeof (String)); | ||
143 | // createCol(regions, "regionAssetSendKey", typeof (String)); | ||
144 | |||
145 | // createCol(regions, "regionUserURI", typeof (String)); | ||
146 | // createCol(regions, "regionUserRecvKey", typeof (String)); | ||
147 | // createCol(regions, "regionUserSendKey", typeof (String)); | ||
148 | |||
149 | // // Add in contraints | ||
150 | // regions.PrimaryKey = new DataColumn[] {regions.Columns["UUID"]}; | ||
151 | // return regions; | ||
152 | // } | ||
153 | |||
154 | // TODO: unused | ||
155 | // private void InitDB(SQLiteConnection conn) | ||
156 | // { | ||
157 | // string createUsers = defineTable(createRegionsTable()); | ||
158 | // SQLiteCommand pcmd = new SQLiteCommand(createUsers, conn); | ||
159 | // conn.Open(); | ||
160 | // pcmd.ExecuteNonQuery(); | ||
161 | // conn.Close(); | ||
162 | // } | ||
163 | |||
164 | /// <summary> | 95 | /// <summary> |
165 | /// Reads a region row from a database reader | 96 | /// Reads a region row from a database reader |
166 | /// </summary> | 97 | /// </summary> |
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs index 5463134..6877690 100644 --- a/OpenSim/Framework/Communications/RestClient/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs | |||
@@ -196,17 +196,6 @@ namespace OpenSim.Framework.Communications | |||
196 | return s.Substring(s.Length - 1, 1) == "/"; | 196 | return s.Substring(s.Length - 1, 1) == "/"; |
197 | } | 197 | } |
198 | 198 | ||
199 | // TODO: unused | ||
200 | // /// <summary> | ||
201 | // /// return a slash or blank. A slash will be returned if the string does not contain one | ||
202 | // /// </summary> | ||
203 | // /// <param name="s">stromg to be examined</param> | ||
204 | // /// <returns>slash '/' if not already present</returns> | ||
205 | // private string slash(string s) | ||
206 | // { | ||
207 | // return isSlashed(s) ? String.Empty : "/"; | ||
208 | // } | ||
209 | |||
210 | /// <summary> | 199 | /// <summary> |
211 | /// Build a Uri based on the initial Url, path elements and parameters | 200 | /// Build a Uri based on the initial Url, path elements and parameters |
212 | /// </summary> | 201 | /// </summary> |
@@ -280,49 +269,6 @@ namespace OpenSim.Framework.Communications | |||
280 | } | 269 | } |
281 | } | 270 | } |
282 | 271 | ||
283 | // TODO: unused | ||
284 | // /// <summary> | ||
285 | // /// Async method, invoked when the initial response if received from the server | ||
286 | // /// </summary> | ||
287 | // /// <param name="ar"></param> | ||
288 | // private void ResponseIsReadyDelegate(IAsyncResult ar) | ||
289 | // { | ||
290 | // try | ||
291 | // { | ||
292 | // // grab response | ||
293 | // WebRequest wr = (WebRequest) ar.AsyncState; | ||
294 | // _response = (HttpWebResponse) wr.EndGetResponse(ar); | ||
295 | |||
296 | // // get response stream, and setup async reading | ||
297 | // Stream s = _response.GetResponseStream(); | ||
298 | // IAsyncResult asynchronousResult = | ||
299 | // s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); | ||
300 | |||
301 | // // TODO! Implement timeout, without killing the server | ||
302 | // // wait until completed, or we timed out | ||
303 | // // ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); | ||
304 | // } | ||
305 | // catch (Exception e) | ||
306 | // { | ||
307 | // _allDone.Set(); | ||
308 | // _asyncException = e; | ||
309 | // } | ||
310 | // } | ||
311 | |||
312 | // TODO: unused | ||
313 | // // Abort the request if the timer fires. | ||
314 | // private static void TimeoutCallback(object state, bool timedOut) | ||
315 | // { | ||
316 | // if (timedOut) | ||
317 | // { | ||
318 | // HttpWebRequest request = state as HttpWebRequest; | ||
319 | // if (request != null) | ||
320 | // { | ||
321 | // request.Abort(); | ||
322 | // } | ||
323 | // } | ||
324 | // } | ||
325 | |||
326 | #endregion Async communications with server | 272 | #endregion Async communications with server |
327 | 273 | ||
328 | /// <summary> | 274 | /// <summary> |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs index a9679f8..b815a37 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs | |||
@@ -38,18 +38,5 @@ namespace OpenSim.Grid.ScriptServer | |||
38 | m_ScriptServerMain = scm; | 38 | m_ScriptServerMain = scm; |
39 | m_Connection = Connection; | 39 | m_Connection = Connection; |
40 | } | 40 | } |
41 | |||
42 | // TODO: unused: | ||
43 | // private void DataReceived(object objectID, object scriptID) | ||
44 | // { | ||
45 | // // TODO: HOW DO WE RECEIVE DATA? ASYNC? | ||
46 | // // ANYHOW WE END UP HERE? | ||
47 | |||
48 | // // NEW SCRIPT? ASK SCRIPTENGINE TO INITIALIZE IT | ||
49 | // ScriptRez(); | ||
50 | |||
51 | // // EVENT? DELIVER EVENT DIRECTLY TO SCRIPTENGINE | ||
52 | // touch_start(); | ||
53 | // } | ||
54 | } | 41 | } |
55 | } | 42 | } |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 33e917a..c0b7380 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -178,120 +178,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | // TODO: unused | ||
182 | // private void RunAssetQueue() | ||
183 | // { | ||
184 | // while (true) | ||
185 | // { | ||
186 | // try | ||
187 | // { | ||
188 | // ProcessAssetQueue(); | ||
189 | // Thread.Sleep(500); | ||
190 | // } | ||
191 | // catch (Exception) | ||
192 | // { | ||
193 | // // m_log.Error("[ASSET CACHE]: " + e.ToString()); | ||
194 | // } | ||
195 | // } | ||
196 | // } | ||
197 | |||
198 | // TODO: unused | ||
199 | // /// <summary> | ||
200 | // /// Process the asset queue which sends packets directly back to the client. | ||
201 | // /// </summary> | ||
202 | // private void ProcessAssetQueue() | ||
203 | // { | ||
204 | // //should move the asset downloading to a module, like has been done with texture downloading | ||
205 | // if (AssetRequests.Count == 0) | ||
206 | // { | ||
207 | // //no requests waiting | ||
208 | // return; | ||
209 | // } | ||
210 | // // if less than 5, do all of them | ||
211 | // int num = Math.Min(5, AssetRequests.Count); | ||
212 | |||
213 | // AssetRequest req; | ||
214 | // for (int i = 0; i < num; i++) | ||
215 | // { | ||
216 | // req = (AssetRequest)AssetRequests[i]; | ||
217 | // //Console.WriteLine("sending asset " + req.RequestAssetID); | ||
218 | // TransferInfoPacket Transfer = new TransferInfoPacket(); | ||
219 | // Transfer.TransferInfo.ChannelType = 2; | ||
220 | // Transfer.TransferInfo.Status = 0; | ||
221 | // Transfer.TransferInfo.TargetType = 0; | ||
222 | // if (req.AssetRequestSource == 2) | ||
223 | // { | ||
224 | // Transfer.TransferInfo.Params = new byte[20]; | ||
225 | // Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); | ||
226 | // int assType = (int)req.AssetInf.Type; | ||
227 | // Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); | ||
228 | // } | ||
229 | // else if (req.AssetRequestSource == 3) | ||
230 | // { | ||
231 | // Transfer.TransferInfo.Params = req.Params; | ||
232 | // // Transfer.TransferInfo.Params = new byte[100]; | ||
233 | // //Array.Copy(req.RequestUser.AgentId.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); | ||
234 | // //Array.Copy(req.RequestUser.SessionId.GetBytes(), 0, Transfer.TransferInfo.Params, 16, 16); | ||
235 | // } | ||
236 | // Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length; | ||
237 | // Transfer.TransferInfo.TransferID = req.TransferRequestID; | ||
238 | // req.RequestUser.OutPacket(Transfer, ThrottleOutPacketType.Asset); | ||
239 | |||
240 | // if (req.NumPackets == 1) | ||
241 | // { | ||
242 | // TransferPacketPacket TransferPacket = new TransferPacketPacket(); | ||
243 | // TransferPacket.TransferData.Packet = 0; | ||
244 | // TransferPacket.TransferData.ChannelType = 2; | ||
245 | // TransferPacket.TransferData.TransferID = req.TransferRequestID; | ||
246 | // TransferPacket.TransferData.Data = req.AssetInf.Data; | ||
247 | // TransferPacket.TransferData.Status = 1; | ||
248 | // req.RequestUser.OutPacket(TransferPacket, ThrottleOutPacketType.Asset); | ||
249 | // } | ||
250 | // else | ||
251 | // { | ||
252 | // int processedLength = 0; | ||
253 | // // libsecondlife hardcodes 1500 as the maximum data chunk size | ||
254 | // int maxChunkSize = 1250; | ||
255 | // int packetNumber = 0; | ||
256 | |||
257 | // while (processedLength < req.AssetInf.Data.Length) | ||
258 | // { | ||
259 | // TransferPacketPacket TransferPacket = new TransferPacketPacket(); | ||
260 | // TransferPacket.TransferData.Packet = packetNumber; | ||
261 | // TransferPacket.TransferData.ChannelType = 2; | ||
262 | // TransferPacket.TransferData.TransferID = req.TransferRequestID; | ||
263 | |||
264 | // int chunkSize = Math.Min(req.AssetInf.Data.Length - processedLength, maxChunkSize); | ||
265 | // byte[] chunk = new byte[chunkSize]; | ||
266 | // Array.Copy(req.AssetInf.Data, processedLength, chunk, 0, chunk.Length); | ||
267 | |||
268 | // TransferPacket.TransferData.Data = chunk; | ||
269 | |||
270 | // // 0 indicates more packets to come, 1 indicates last packet | ||
271 | // if (req.AssetInf.Data.Length - processedLength > maxChunkSize) | ||
272 | // { | ||
273 | // TransferPacket.TransferData.Status = 0; | ||
274 | // } | ||
275 | // else | ||
276 | // { | ||
277 | // TransferPacket.TransferData.Status = 1; | ||
278 | // } | ||
279 | |||
280 | // req.RequestUser.OutPacket(TransferPacket, ThrottleOutPacketType.Asset); | ||
281 | |||
282 | // processedLength += chunkSize; | ||
283 | // packetNumber++; | ||
284 | // } | ||
285 | // } | ||
286 | // } | ||
287 | |||
288 | // //remove requests that have been completed | ||
289 | // for (int i = 0; i < num; i++) | ||
290 | // { | ||
291 | // AssetRequests.RemoveAt(0); | ||
292 | // } | ||
293 | // } | ||
294 | |||
295 | /// <summary> | 181 | /// <summary> |
296 | /// Calculate the number of packets required to send the asset to the client. | 182 | /// Calculate the number of packets required to send the asset to the client. |
297 | /// </summary> | 183 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs index 735a3cf..68ca5e9 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -239,12 +239,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture | |||
239 | part.ScheduleFullUpdate(); | 239 | part.ScheduleFullUpdate(); |
240 | } | 240 | } |
241 | 241 | ||
242 | // TODO: unused | ||
243 | // private byte[] BlendTextures(byte[] frontImage, byte[] backImage) | ||
244 | // { | ||
245 | // return BlendTextures(frontImage, backImage, false, 0); | ||
246 | // } | ||
247 | |||
248 | private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha) | 242 | private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha) |
249 | { | 243 | { |
250 | Bitmap image1 = new Bitmap(OpenJPEG.DecodeToImage(frontImage)); | 244 | Bitmap image1 = new Bitmap(OpenJPEG.DecodeToImage(frontImage)); |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs index 6a5a166..d4f3b9f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs | |||
@@ -31,39 +31,6 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
31 | { | 31 | { |
32 | public class FlattenSphere : ITerrainPaintableEffect | 32 | public class FlattenSphere : ITerrainPaintableEffect |
33 | { | 33 | { |
34 | // TODO: unused | ||
35 | // private double GetBilinearInterpolate(double x, double y, ITerrainChannel map) | ||
36 | // { | ||
37 | // int w = map.Width; | ||
38 | // int h = map.Height; | ||
39 | |||
40 | // if (x > w - 2.0) | ||
41 | // x = w - 2.0; | ||
42 | // if (y > h - 2.0) | ||
43 | // y = h - 2.0; | ||
44 | // if (x < 0.0) | ||
45 | // x = 0.0; | ||
46 | // if (y < 0.0) | ||
47 | // y = 0.0; | ||
48 | |||
49 | // int stepSize = 1; | ||
50 | // double h00 = map[(int)x, (int)y]; | ||
51 | // double h10 = map[(int)x + stepSize, (int)y]; | ||
52 | // double h01 = map[(int)x, (int)y + stepSize]; | ||
53 | // double h11 = map[(int)x + stepSize, (int)y + stepSize]; | ||
54 | // double h1 = h00; | ||
55 | // double h2 = h10; | ||
56 | // double h3 = h01; | ||
57 | // double h4 = h11; | ||
58 | // double a00 = h1; | ||
59 | // double a10 = h2 - h1; | ||
60 | // double a01 = h3 - h1; | ||
61 | // double a11 = h1 - h2 - h3 + h4; | ||
62 | // double partialx = x - (int)x; | ||
63 | // double partialz = y - (int)y; | ||
64 | // double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz); | ||
65 | // return hi; | ||
66 | // } | ||
67 | 34 | ||
68 | #region ITerrainPaintableEffect Members | 35 | #region ITerrainPaintableEffect Members |
69 | 36 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4a80b8d..2ce6314 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -794,28 +794,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
794 | } | 794 | } |
795 | } | 795 | } |
796 | 796 | ||
797 | //Updates the time in the viewer. | ||
798 | // TODO: unused | ||
799 | // private void UpdateInWorldTime() | ||
800 | // { | ||
801 | // m_timeUpdateCount++; | ||
802 | // if (m_timeUpdateCount > 600) | ||
803 | // { | ||
804 | // List<ScenePresence> avatars = GetAvatars(); | ||
805 | // foreach (ScenePresence avatar in avatars) | ||
806 | // { | ||
807 | // avatar.ControllingClient.SendViewerTime(m_timePhase); | ||
808 | // } | ||
809 | |||
810 | // m_timeUpdateCount = 0; | ||
811 | // m_timePhase++; | ||
812 | // if (m_timePhase > 94) | ||
813 | // { | ||
814 | // m_timePhase = 0; | ||
815 | // } | ||
816 | // } | ||
817 | // } | ||
818 | |||
819 | private void SendSimStatsPackets(SimStatsPacket pack) | 797 | private void SendSimStatsPackets(SimStatsPacket pack) |
820 | { | 798 | { |
821 | List<ScenePresence> StatSendAgents = GetScenePresences(); | 799 | List<ScenePresence> StatSendAgents = GetScenePresences(); |
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs index 00a7df3..1b0b6b7 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs | |||
@@ -71,24 +71,5 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples | |||
71 | System.Console.WriteLine(sequence); | 71 | System.Console.WriteLine(sequence); |
72 | }*/ | 72 | }*/ |
73 | } | 73 | } |
74 | |||
75 | // TODO: unused | ||
76 | // private string processPrimitiveToString(SceneObjectPart prim) | ||
77 | // { | ||
78 | // /*string desc = prim.Description; | ||
79 | // string name = prim.Name; | ||
80 | // LLVector3 pos = prim.Pos; | ||
81 | // LLQuaternion rot = new LLQuaternion(prim.Rotation.x, prim.Rotation.y, prim.Rotation.z, prim.Rotation.w); | ||
82 | // LLVector3 scale = prim.Scale; | ||
83 | // LLVector3 rootPos = prim.WorldPos; | ||
84 | |||
85 | // string setPrimParams = String.Empty; | ||
86 | |||
87 | // setPrimParams += "[PRIM_SCALE, " + scale.ToString() + ", PRIM_POS, " + rootPos.ToString() + ", PRIM_ROTATION, " + rot.ToString() + "]\n"; | ||
88 | |||
89 | // return setPrimParams; | ||
90 | // */ | ||
91 | // return System.String.Empty; | ||
92 | // } | ||
93 | } | 74 | } |
94 | } | 75 | } |
diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs index ec71973..61cc908 100644 --- a/OpenSim/TestSuite/BotManager.cs +++ b/OpenSim/TestSuite/BotManager.cs | |||
@@ -178,23 +178,6 @@ namespace OpenSim.TestSuite | |||
178 | { | 178 | { |
179 | return new ConsoleBase("Region", this); | 179 | return new ConsoleBase("Region", this); |
180 | } | 180 | } |
181 | |||
182 | /// <summary> | ||
183 | /// I don't think the bots use this.. | ||
184 | /// </summary> | ||
185 | /// <param name="commandParams"></param> | ||
186 | /// <param name="pos"></param> | ||
187 | /// <returns></returns> | ||
188 | // TODO: unused: private string CombineParams(string[] commandParams, int pos) | ||
189 | // TODO: unused: { | ||
190 | // TODO: unused: string result = String.Empty; | ||
191 | // TODO: unused: for (int i = pos; i < commandParams.Length; i++) | ||
192 | // TODO: unused: { | ||
193 | // TODO: unused: result += commandParams[i] + " "; | ||
194 | // TODO: unused: } | ||
195 | // TODO: unused: result = result.TrimEnd(' '); | ||
196 | // TODO: unused: return result; | ||
197 | // TODO: unused: } | ||
198 | 181 | ||
199 | /// <summary> | 182 | /// <summary> |
200 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit | 183 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit |
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index df06f47..8877f7d 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
@@ -177,23 +177,6 @@ namespace pCampBot | |||
177 | { | 177 | { |
178 | return new ConsoleBase("Region", this); | 178 | return new ConsoleBase("Region", this); |
179 | } | 179 | } |
180 | |||
181 | /// <summary> | ||
182 | /// I don't think the bots use this.. | ||
183 | /// </summary> | ||
184 | /// <param name="commandParams"></param> | ||
185 | /// <param name="pos"></param> | ||
186 | /// <returns></returns> | ||
187 | // TODO: unused: private string CombineParams(string[] commandParams, int pos) | ||
188 | // TODO: unused: { | ||
189 | // TODO: unused: string result = String.Empty; | ||
190 | // TODO: unused: for (int i = pos; i < commandParams.Length; i++) | ||
191 | // TODO: unused: { | ||
192 | // TODO: unused: result += commandParams[i] + " "; | ||
193 | // TODO: unused: } | ||
194 | // TODO: unused: result = result.TrimEnd(' '); | ||
195 | // TODO: unused: return result; | ||
196 | // TODO: unused: } | ||
197 | 180 | ||
198 | /// <summary> | 181 | /// <summary> |
199 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit | 182 | /// Command runnint tool.. Currently use it to add bots, shutdown and (dangerous)Forcequit |