[Opensim-dev] [Opensim-commits] r9036 - in trunk/OpenSim

[Alan M Webb]

Dr Schofield is not going to be around for a few days, so I'll take the 
liberty of responding. It's my fault anyway. The files showed up flagged 
as a deleted  in my repository, and I have inadvertently propagated that 
deletion with my change. My apologies. Perhaps someone with commit 
authority could restore these files?

Best regards
Alan
-------------------
T.J. Watson Research Center, Hawthorne, NY
1-914-784-7286
alan_webb at us.ibm.com



From:
Mikko Pallari <mikko.pallari at adminotech.com>
To:
"opensim-dev at lists.berlios.de" <opensim-dev at lists.berlios.de>
Date:
04/08/2009 02:22 AM
Subject:
Re: [Opensim-dev] [Opensim-commits] r9036 - in trunk/OpenSim



Hi,

Was there some particular reason why the OpenSim.32BitLaunch.csproj was 
removed from trunk? It has been previously found very useful: 
http://teddmaa.blogspot.com/2008/12/opensim-in-visual-studio-on-win64.html

Cheers,
Mikko

-----Original Message-----
From: opensim-commits-bounces at lists.berlios.de [
mailto:opensim-commits-bounces at lists.berlios.de] On Behalf Of 
drscofield at opensimulator.org
Sent: 7. huhtikuuta 2009 19:54
To: opensim-commits at lists.berlios.de
Subject: [Opensim-commits] r9036 - in trunk/OpenSim: 
Region/OptionalModules/Avatar/Chat Tools/OpenSim.32BitLaunch 
Tools/OpenSim.GridLaunch

Author: drscofield
Date: 2009-04-07 09:53:41 -0700 (Tue, 07 Apr 2009)
New Revision: 9036

Removed:
   trunk/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
   trunk/OpenSim/Tools/OpenSim.GridLaunch/OpenSim.GridLaunch.csproj
Modified:
   trunk/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
Log:
From: Alan Webb <alan_webb at us.ibm.com>

  Fix null reference exception during close down of IRC module if the
  region was not actually initialized.

Modified: 
trunk/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
===================================================================
--- trunk/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs 
2009-04-07 16:41:07 UTC (rev 9035)
+++ trunk/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs 
2009-04-07 16:53:41 UTC (rev 9036)
@@ -148,8 +148,16 @@
             if (!enabled)
                 return;

+            if (region == null)
+                return;
+
             region.Close();
-            lock (m_regions) m_regions.Remove(region);
+
+            if(m_regions.Contains(region))
+            {
+                lock (m_regions) m_regions.Remove(region);
+            }
+
         }

         #endregion

_______________________________________________
Opensim-commits mailing list
Opensim-commits at lists.berlios.de
https://lists.berlios.de/mailman/listinfo/opensim-commits
_______________________________________________
Opensim-dev mailing list
Opensim-dev at lists.berlios.de
https://lists.berlios.de/mailman/listinfo/opensim-dev


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://opensimulator.org/pipermail/opensim-dev/attachments/20090408/dae388b0/attachment-0001.html>