diff options
author | Diva Canto | 2009-10-06 09:54:15 -0700 |
---|---|---|
committer | Diva Canto | 2009-10-06 09:54:15 -0700 |
commit | 3db4d38645260b0299e082b47b010dddf569bf31 (patch) | |
tree | 818a5b9675fd0cdd300a2660765aa847e6182b4b | |
parent | Corrected words in error message. (diff) | |
download | opensim-SC-3db4d38645260b0299e082b47b010dddf569bf31.zip opensim-SC-3db4d38645260b0299e082b47b010dddf569bf31.tar.gz opensim-SC-3db4d38645260b0299e082b47b010dddf569bf31.tar.bz2 opensim-SC-3db4d38645260b0299e082b47b010dddf569bf31.tar.xz |
Removing dependencies on System.Runtime.Remoting.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | 4 | ||||
-rw-r--r-- | prebuild.xml | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs index 44e850b..6c89ac8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | |||
@@ -61,6 +61,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
61 | 61 | ||
62 | private void OnRegionUp(GridRegion otherRegion) | 62 | private void OnRegionUp(GridRegion otherRegion) |
63 | { | 63 | { |
64 | // This shouldn't happen | ||
65 | if (otherRegion == null) | ||
66 | return; | ||
67 | |||
64 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", | 68 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", |
65 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); | 69 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); |
66 | 70 | ||
diff --git a/prebuild.xml b/prebuild.xml index f863ab6..e58b81b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -724,7 +724,6 @@ | |||
724 | <Reference name="System"/> | 724 | <Reference name="System"/> |
725 | <Reference name="System.Xml"/> | 725 | <Reference name="System.Xml"/> |
726 | <Reference name="System.Drawing"/> | 726 | <Reference name="System.Drawing"/> |
727 | <Reference name="System.Runtime.Remoting"/> | ||
728 | <Reference name="System.Web"/> | 727 | <Reference name="System.Web"/> |
729 | <Reference name="OpenMetaverseTypes.dll"/> | 728 | <Reference name="OpenMetaverseTypes.dll"/> |
730 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 729 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
@@ -805,7 +804,6 @@ | |||
805 | <Reference name="System"/> | 804 | <Reference name="System"/> |
806 | <Reference name="System.Xml"/> | 805 | <Reference name="System.Xml"/> |
807 | <Reference name="System.Data"/> | 806 | <Reference name="System.Data"/> |
808 | <Reference name="System.Runtime.Remoting"/> | ||
809 | <Reference name="OpenSim.Framework"/> | 807 | <Reference name="OpenSim.Framework"/> |
810 | <Reference name="OpenSim.Data" /> | 808 | <Reference name="OpenSim.Data" /> |
811 | <Reference name="OpenSim.Framework.Communications" /> | 809 | <Reference name="OpenSim.Framework.Communications" /> |
@@ -1539,7 +1537,6 @@ | |||
1539 | <Reference name="System"/> | 1537 | <Reference name="System"/> |
1540 | <Reference name="System.Xml"/> | 1538 | <Reference name="System.Xml"/> |
1541 | <Reference name="System.Drawing"/> | 1539 | <Reference name="System.Drawing"/> |
1542 | <Reference name="System.Runtime.Remoting"/> | ||
1543 | <Reference name="System.Web"/> | 1540 | <Reference name="System.Web"/> |
1544 | <Reference name="OpenMetaverseTypes.dll"/> | 1541 | <Reference name="OpenMetaverseTypes.dll"/> |
1545 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1542 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
@@ -1624,7 +1621,6 @@ | |||
1624 | <Reference name="System"/> | 1621 | <Reference name="System"/> |
1625 | <Reference name="System.Xml"/> | 1622 | <Reference name="System.Xml"/> |
1626 | <Reference name="System.Drawing"/> | 1623 | <Reference name="System.Drawing"/> |
1627 | <Reference name="System.Runtime.Remoting"/> | ||
1628 | <Reference name="System.Web"/> | 1624 | <Reference name="System.Web"/> |
1629 | <Reference name="OpenMetaverseTypes.dll"/> | 1625 | <Reference name="OpenMetaverseTypes.dll"/> |
1630 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1626 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
@@ -1682,7 +1678,6 @@ | |||
1682 | <ReferencePath>../../../../bin/</ReferencePath> | 1678 | <ReferencePath>../../../../bin/</ReferencePath> |
1683 | <Reference name="System"/> | 1679 | <Reference name="System"/> |
1684 | <Reference name="System.Drawing"/> | 1680 | <Reference name="System.Drawing"/> |
1685 | <Reference name="System.Runtime.Remoting"/> | ||
1686 | <Reference name="System.Xml"/> | 1681 | <Reference name="System.Xml"/> |
1687 | <Reference name="OpenSim.Data"/> | 1682 | <Reference name="OpenSim.Data"/> |
1688 | <Reference name="OpenSim.Framework"/> | 1683 | <Reference name="OpenSim.Framework"/> |
@@ -3590,7 +3585,6 @@ | |||
3590 | <Reference name="System"/> | 3585 | <Reference name="System"/> |
3591 | <Reference name="System.Xml"/> | 3586 | <Reference name="System.Xml"/> |
3592 | <Reference name="System.Drawing"/> | 3587 | <Reference name="System.Drawing"/> |
3593 | <Reference name="System.Runtime.Remoting"/> | ||
3594 | <Reference name="OpenMetaverseTypes.dll"/> | 3588 | <Reference name="OpenMetaverseTypes.dll"/> |
3595 | <Reference name="OpenMetaverse.dll"/> | 3589 | <Reference name="OpenMetaverse.dll"/> |
3596 | <Reference name="OpenSim.Data"/> | 3590 | <Reference name="OpenSim.Data"/> |