aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMichael Cortez2009-08-06 09:38:51 -0700
committerMichael Cortez2009-08-06 09:38:51 -0700
commit2ac04cb624d36c048b6793f9db7c073eb6a01026 (patch)
treecb76f55c634c9f1107dea7204729497c5ba3bb75 /OpenSim/Region
parentFixing comments re: INI file. (diff)
parentAdd the config-include statement to OpenSim.ini.example. (diff)
downloadopensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.zip
opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.gz
opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.bz2
opensim-SC_OLD-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.xz
Merge branch 'master' into groups-core-contrib
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs7
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs4
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs41
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs48
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
8 files changed, 64 insertions, 50 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 1be36ca..7bb8864 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -188,10 +188,11 @@ namespace OpenSim
188 { 188 {
189 string path = Path.GetFullPath( 189 string path = Path.GetFullPath(
190 Path.Combine(Util.configDir(), file)); 190 Path.Combine(Util.configDir(), file));
191 if (File.Exists(path)) 191 string[] paths = Util.Glob(path);
192 foreach (string p in paths)
192 { 193 {
193 if (!sources.Contains(path)) 194 if (!sources.Contains(p))
194 sources.Add(path); 195 sources.Add(p);
195 } 196 }
196 } 197 }
197 } 198 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index fad9218..eaf8f60 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); 827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
828 } 828 }
829 } 829 }
830 catch (NullReferenceException n) 830 catch (NullReferenceException)
831 { 831 {
832 m_log.Debug("[PACKET] Detected reuse of a returned packet"); 832 m_log.Error("[PACKET]: Detected reuse of a returned packet");
833 m_PacketQueue.Cancel(item.Sequence); 833 m_PacketQueue.Cancel(item.Sequence);
834 return; 834 return;
835 } 835 }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 5be2a65..19f0f90 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
45 /// </summary> 45 /// </summary>
46 public class UserTextureDownloadService 46 public class UserTextureDownloadService
47 { 47 {
48 private static readonly ILog m_log 48// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 49
51 /// <summary> 50 /// <summary>
52 /// True if the service has been closed, probably because a user with texture requests still queued 51 /// True if the service has been closed, probably because a user with texture requests still queued
@@ -61,22 +60,22 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
61 /// currently handle properly as far as I know). However, this situation should be handled in a more 60 /// currently handle properly as far as I know). However, this situation should be handled in a more
62 /// sophisticated way. 61 /// sophisticated way.
63 /// </summary> 62 /// </summary>
64 private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5; 63// private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
65 64
66 /// <summary> 65 /// <summary>
67 /// XXX Also going to limit requests for found textures. 66 /// XXX Also going to limit requests for found textures.
68 /// </summary> 67 /// </summary>
69 private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy 68// private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy
70 = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); 69// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
71 70
72 private readonly IClientAPI m_client; 71// private readonly IClientAPI m_client;
73 private readonly Scene m_scene; 72 private readonly Scene m_scene;
74 73
75 /// <summary> 74 /// <summary>
76 /// Texture Senders are placed in this queue once they have received their texture from the asset 75 /// Texture Senders are placed in this queue once they have received their texture from the asset
77 /// cache. Another module actually invokes the send. 76 /// cache. Another module actually invokes the send.
78 /// </summary> 77 /// </summary>
79 private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue; 78// private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue;
80 79
81 /// <summary> 80 /// <summary>
82 /// Holds texture senders before they have received the appropriate texture from the asset cache. 81 /// Holds texture senders before they have received the appropriate texture from the asset cache.
@@ -88,15 +87,15 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
88 /// XXX This is really a temporary solution to deal with the situation where a client continually requests 87 /// XXX This is really a temporary solution to deal with the situation where a client continually requests
89 /// the same missing textures 88 /// the same missing textures
90 /// </summary> 89 /// </summary>
91 private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy 90// private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
92 = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); 91// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
93 92
94 public UserTextureDownloadService( 93 public UserTextureDownloadService(
95 IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) 94 IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue)
96 { 95 {
97 m_client = client; 96// m_client = client;
98 m_scene = scene; 97 m_scene = scene;
99 m_sharedSendersQueue = sharedQueue; 98// m_sharedSendersQueue = sharedQueue;
100 } 99 }
101 100
102 /// <summary> 101 /// <summary>
@@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
231 /// Place a ready texture sender on the processing queue. 230 /// Place a ready texture sender on the processing queue.
232 /// </summary> 231 /// </summary>
233 /// <param name="textureSender"></param> 232 /// <param name="textureSender"></param>
234 private void EnqueueTextureSender(ITextureSender textureSender) 233// private void EnqueueTextureSender(ITextureSender textureSender)
235 { 234// {
236 textureSender.Cancel = false; 235// textureSender.Cancel = false;
237 textureSender.Sending = true; 236// textureSender.Sending = true;
238 237//
239 if (!m_sharedSendersQueue.Contains(textureSender)) 238// if (!m_sharedSendersQueue.Contains(textureSender))
240 { 239// {
241 m_sharedSendersQueue.Enqueue(textureSender); 240// m_sharedSendersQueue.Enqueue(textureSender);
242 } 241// }
243 } 242// }
244 243
245 /// <summary> 244 /// <summary>
246 /// Close this module. 245 /// Close this module.
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index dd524f5..14cee36 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
66 /// <summary> 66 /// <summary>
67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). 67 /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
68 /// </summary> 68 /// </summary>
69 //[Test] 69 [Test]
70 public void TestSaveIarV0_1() 70 public void TestSaveIarV0_1()
71 { 71 {
72 TestHelper.InMethod(); 72 TestHelper.InMethod();
@@ -202,19 +202,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
202 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 202 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
203 /// an account exists with the creator name. 203 /// an account exists with the creator name.
204 /// </summary> 204 /// </summary>
205 //[Test] 205 [Test]
206 public void TestLoadIarV0_1ExistingUsers() 206 public void TestLoadIarV0_1ExistingUsers()
207 { 207 {
208 TestHelper.InMethod(); 208 TestHelper.InMethod();
209 209
210 //log4net.Config.XmlConfigurator.Configure(); 210 log4net.Config.XmlConfigurator.Configure();
211 211
212 string userFirstName = "Mr"; 212 string userFirstName = "Mr";
213 string userLastName = "Tiddles"; 213 string userLastName = "Tiddles";
214 UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555"); 214 UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
215 string user2FirstName = "Lord"; 215 string userItemCreatorFirstName = "Lord";
216 string user2LastName = "Lucan"; 216 string userItemCreatorLastName = "Lucan";
217 UUID user2Uuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); 217 UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
218 218
219 string itemName = "b.lsl"; 219 string itemName = "b.lsl";
220 string archiveItemName 220 string archiveItemName
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
227 item1.Name = itemName; 227 item1.Name = itemName;
228 item1.AssetID = UUID.Random(); 228 item1.AssetID = UUID.Random();
229 item1.GroupID = UUID.Random(); 229 item1.GroupID = UUID.Random();
230 item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName); 230 item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
231 //item1.CreatorId = userUuid.ToString(); 231 //item1.CreatorId = userUuid.ToString();
232 //item1.CreatorId = "00000000-0000-0000-0000-000000000444"; 232 //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
233 item1.Owner = UUID.Zero; 233 item1.Owner = UUID.Zero;
@@ -249,13 +249,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
249 userAdminService.AddUser( 249 userAdminService.AddUser(
250 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); 250 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
251 userAdminService.AddUser( 251 userAdminService.AddUser(
252 user2FirstName, user2LastName, "hampshire", String.Empty, 1000, 1000, user2Uuid); 252 userItemCreatorFirstName, userItemCreatorLastName, "hampshire",
253 String.Empty, 1000, 1000, userItemCreatorUuid);
253 254
254 archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); 255 archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream);
255 256
256 CachedUserInfo userInfo 257 CachedUserInfo userInfo
257 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); 258 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
258 userInfo.FetchInventory(); 259 //userInfo.FetchInventory();
260 /*
259 for (int i = 0 ; i < 50 ; i++) 261 for (int i = 0 ; i < 50 ; i++)
260 { 262 {
261 if (userInfo.HasReceivedInventory == true) 263 if (userInfo.HasReceivedInventory == true)
@@ -263,18 +265,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
263 Thread.Sleep(200); 265 Thread.Sleep(200);
264 } 266 }
265 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); 267 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
268 */
266 InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); 269 InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
267 Assert.That(foundItem, Is.Not.Null); 270 Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item");
268 Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId)); 271 Assert.That(
269 Assert.That(foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid)); 272 foundItem.CreatorId, Is.EqualTo(item1.CreatorId),
270 Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); 273 "Loaded item non-uuid creator doesn't match original");
271 274 Assert.That(
272 Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); 275 foundItem.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid),
276 "Loaded item uuid creator doesn't match original");
277 Assert.That(foundItem.Owner, Is.EqualTo(userUuid),
278 "Loaded item owner doesn't match inventory reciever");
273 } 279 }
274 280
275 /// <summary> 281 /// <summary>
276 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 282 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
277 /// no account exists with the creator name 283 /// no account exists with the creator name
278 /// </summary> 284 /// </summary>
279 //[Test] 285 //[Test]
280 public void TestLoadIarV0_1TempProfiles() 286 public void TestLoadIarV0_1TempProfiles()
@@ -362,6 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
362 368
363 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager); 369 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
364 userInfo.FetchInventory(); 370 userInfo.FetchInventory();
371 /*
365 for (int i = 0 ; i < 50 ; i++) 372 for (int i = 0 ; i < 50 ; i++)
366 { 373 {
367 if (userInfo.HasReceivedInventory == true) 374 if (userInfo.HasReceivedInventory == true)
@@ -369,6 +376,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
369 Thread.Sleep(200); 376 Thread.Sleep(200);
370 } 377 }
371 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)"); 378 Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
379 */
380
381 Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
382
372 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>(); 383 Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
373 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); 384 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
374 385
@@ -386,10 +397,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
386 = string.Format( 397 = string.Format(
387 "{0}{1}/{2}/{3}", 398 "{0}{1}/{2}/{3}",
388 ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemName); 399 ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemName);
400
401 Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
389 402
390 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null) 403 new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
391 .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded); 404 .ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
392 405
406 Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
393 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); 407 InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
394 Assert.That(folder1, Is.Not.Null, "Could not find folder a"); 408 Assert.That(folder1, Is.Not.Null, "Could not find folder a");
395 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b"); 409 InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 7082e85..ad42523 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
60 60
61 public class UrlModule : ISharedRegionModule, IUrlModule 61 public class UrlModule : ISharedRegionModule, IUrlModule
62 { 62 {
63 private static readonly ILog m_log = 63// private static readonly ILog m_log =
64 LogManager.GetLogger( 64// LogManager.GetLogger(
65 MethodBase.GetCurrentMethod().DeclaringType); 65// MethodBase.GetCurrentMethod().DeclaringType);
66 66
67 private Dictionary<UUID, UrlData> m_RequestMap = 67 private Dictionary<UUID, UrlData> m_RequestMap =
68 new Dictionary<UUID, UrlData>(); 68 new Dictionary<UUID, UrlData>();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a304357..e70d985 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenMetaverse; 40using OpenMetaverse;
41 41
42
43namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
44{ 43{
45 public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService 44 public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 83db396..9805ff5 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin
2863 //if ((framecount % m_randomizeWater) == 0) 2863 //if ((framecount % m_randomizeWater) == 0)
2864 // randomizeWater(waterlevel); 2864 // randomizeWater(waterlevel);
2865 2865
2866 int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); 2866 //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
2867 m_rayCastManager.ProcessQueuedRequests();
2867 2868
2868 collision_optimized(timeStep); 2869 collision_optimized(timeStep);
2869 2870
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index acab734..bc36fda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9032,8 +9032,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9032 Match m = r.Match(url); 9032 Match m = r.Match(url);
9033 if (m.Success) { 9033 if (m.Success) {
9034 for (int i = 1; i < gnums.Length; i++) { 9034 for (int i = 1; i < gnums.Length; i++) {
9035 System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 9035 //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9036 CaptureCollection cc = g.Captures; 9036 //CaptureCollection cc = g.Captures;
9037 } 9037 }
9038 if (m.Groups.Count == 5) { 9038 if (m.Groups.Count == 5) {
9039 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 9039 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));