aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 18:32:32 +0000
committerDr Scofield2008-06-27 18:32:32 +0000
commit2f6a5f55753aac5f9718dddf39e2c73560c9e9c3 (patch)
tree723d95a1fd079b8fb870786d359e4a07aef92a60 /OpenSim/Region/Environment
parent* fix a bug where I was assuming all entities would be SceneObjectGroups - of... (diff)
downloadopensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.zip
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.gz
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.bz2
opensim-SC_OLD-2f6a5f55753aac5f9718dddf39e2c73560c9e9c3.tar.xz
dr scofield's continuing warnings safari:
* code caught lingering around with no real purpose other than causing warnings will be taken down.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 0762291..c5a4a96 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
376 m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); 376 m_log.Info("[FRIEND]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
377 if (avatar.JID.Length > 0) 377 if (avatar.JID.Length > 0)
378 { 378 {
379 JId avatarID = new JId(avatar.JID); 379 // JId avatarID = new JId(avatar.JID);
380 // REST Post XMPP Stanzas! 380 // REST Post XMPP Stanzas!
381 } 381 }
382 // Claim User! my user! Mine mine mine! 382 // Claim User! my user! Mine mine mine!
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 0944406..bb3303f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -636,7 +636,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
636 } 636 }
637 catch (WebException e) 637 catch (WebException e)
638 { 638 {
639 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} the host didn't respond", "http://" + reginfo.ExternalHostName + ":" + reginfo.HttpPort); 639 m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to http://{0}:{1} the host didn't respond ({2})",
640 reginfo.ExternalHostName, reginfo.HttpPort, e.Message);
640 } 641 }
641 642
642 return false; 643 return false;