aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorDr Scofield2009-02-06 16:55:34 +0000
committerDr Scofield2009-02-06 16:55:34 +0000
commit9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Framework/Communications/Cache
parent* removed superfluous constants class (diff)
downloadopensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 1b3e70d..038c591 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -163,8 +163,11 @@ namespace OpenSim.Framework.Communications.Cache
163 passwordIterations); 163 passwordIterations);
164 164
165 // Use the password to generate pseudo-random bytes for the encryption 165 // Use the password to generate pseudo-random bytes for the encryption
166 // key. Specify the size of the key in bytes (instead of bits). 166 // key. Specify the size of the key in bytes (instead
167 // of bits).
168 #pragma warning disable 0618
167 byte[] keyBytes = password.GetBytes(keySize / 8); 169 byte[] keyBytes = password.GetBytes(keySize / 8);
170 #pragma warning restore 0618
168 171
169 // Create uninitialized Rijndael encryption object. 172 // Create uninitialized Rijndael encryption object.
170 RijndaelManaged symmetricKey = new RijndaelManaged(); 173 RijndaelManaged symmetricKey = new RijndaelManaged();
@@ -276,8 +279,11 @@ namespace OpenSim.Framework.Communications.Cache
276 passwordIterations); 279 passwordIterations);
277 280
278 // Use the password to generate pseudo-random bytes for the encryption 281 // Use the password to generate pseudo-random bytes for the encryption
279 // key. Specify the size of the key in bytes (instead of bits). 282 // key. Specify the size of the key in bytes (instead
283 // of bits).
284 #pragma warning disable 0618
280 byte[] keyBytes = password.GetBytes(keySize / 8); 285 byte[] keyBytes = password.GetBytes(keySize / 8);
286 #pragma warning restore 0618
281 287
282 // Create uninitialized Rijndael encryption object. 288 // Create uninitialized Rijndael encryption object.
283 RijndaelManaged symmetricKey = new RijndaelManaged(); 289 RijndaelManaged symmetricKey = new RijndaelManaged();