aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-17 17:08:14 +0000
committerJustin Clarke Casey2008-10-17 17:08:14 +0000
commite4b8912296536aab8a267ddbaee5d95419f806e8 (patch)
treef8e16ea6fc771634b70e87447a9eb3286de130f6
parent* Apply a modified version of http://opensimulator.org/mantis/view.php?id=2290 (diff)
downloadopensim-SC_OLD-e4b8912296536aab8a267ddbaee5d95419f806e8.zip
opensim-SC_OLD-e4b8912296536aab8a267ddbaee5d95419f806e8.tar.gz
opensim-SC_OLD-e4b8912296536aab8a267ddbaee5d95419f806e8.tar.bz2
opensim-SC_OLD-e4b8912296536aab8a267ddbaee5d95419f806e8.tar.xz
* reverse part of a change that accidentally crept in with the last revision
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs3
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 32bfed7..ba9cf27 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Framework.Communications
84 84
85 return null; 85 return null;
86 } 86 }
87
87 public void ResetAttachments(UUID userID) 88 public void ResetAttachments(UUID userID)
88 { 89 {
89 foreach (IUserDataPlugin plugin in _plugins) 90 foreach (IUserDataPlugin plugin in _plugins)
@@ -91,6 +92,7 @@ namespace OpenSim.Framework.Communications
91 plugin.ResetAttachments(userID); 92 plugin.ResetAttachments(userID);
92 } 93 }
93 } 94 }
95
94 public UserAgentData GetAgentByUUID(UUID userId) 96 public UserAgentData GetAgentByUUID(UUID userId)
95 { 97 {
96 foreach (IUserDataPlugin plugin in _plugins) 98 foreach (IUserDataPlugin plugin in _plugins)
@@ -105,6 +107,7 @@ namespace OpenSim.Framework.Communications
105 107
106 return null; 108 return null;
107 } 109 }
110
108 // see IUserService 111 // see IUserService
109 public UserProfileData GetUserProfile(UUID uuid) 112 public UserProfileData GetUserProfile(UUID uuid)
110 { 113 {
@@ -137,6 +140,7 @@ namespace OpenSim.Framework.Communications
137 return new List<AvatarPickerAvatar>(); 140 return new List<AvatarPickerAvatar>();
138 } 141 }
139 } 142 }
143
140 return pickerlist; 144 return pickerlist;
141 } 145 }
142 146
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 1f1f88b..20452e0 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
60 /// <value> 60 /// <value>
61 /// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods 61 /// The endpoint of a sender of a particular packet. The port is changed by the various socket receive methods
62 /// </value> 62 /// </value>
63 protected EndPoint epSender = new IPEndPoint(IPAddress.Any, 0); 63 protected EndPoint epSender;
64 64
65 protected EndPoint epProxy; 65 protected EndPoint epProxy;
66 protected int proxyPortOffset; 66 protected int proxyPortOffset;
@@ -175,6 +175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
175 /// <param name="result"></param> 175 /// <param name="result"></param>
176 protected virtual void OnReceivedData(IAsyncResult result) 176 protected virtual void OnReceivedData(IAsyncResult result)
177 { 177 {
178 epSender = new IPEndPoint(listenIP, 0);
178 Packet packet = null; 179 Packet packet = null;
179 180
180 int numBytes = 1; 181 int numBytes = 1;