diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
3 files changed, 7 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index fb408a4..535d946 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -299,7 +299,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
299 | if (bakedTextureFace == null) | 299 | if (bakedTextureFace == null) |
300 | continue; | 300 | continue; |
301 | 301 | ||
302 | AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString()); | 302 | AssetBase asset; |
303 | cache.Get(bakedTextureFace.TextureID.ToString(), out asset); | ||
303 | 304 | ||
304 | if (asset != null && asset.Local) | 305 | if (asset != null && asset.Local) |
305 | { | 306 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index d1f6054..297346a 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -248,22 +248,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
248 | if (scene == null) | 248 | if (scene == null) |
249 | scene = m_SceneList[0]; | 249 | scene = m_SceneList[0]; |
250 | 250 | ||
251 | // Avination new code | 251 | SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>( |
252 | // SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>( | 252 | "POST", m_RestURL+"/SaveMessage/?scope=" + |
253 | // "POST", m_RestURL+"/SaveMessage/?scope=" + | 253 | scene.RegionInfo.ScopeID.ToString(), im); |
254 | // scene.RegionInfo.ScopeID.ToString(), im); | ||
255 | |||
256 | // current opensim and osgrid compatible | ||
257 | bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | ||
258 | "POST", m_RestURL+"/SaveMessage/", im, 10000); | ||
259 | // current opensim and osgrid compatible end | ||
260 | 254 | ||
261 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) | 255 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) |
262 | { | 256 | { |
263 | IClientAPI client = FindClient(new UUID(im.fromAgentID)); | 257 | IClientAPI client = FindClient(new UUID(im.fromAgentID)); |
264 | if (client == null) | 258 | if (client == null) |
265 | return; | 259 | return; |
266 | /* Avination new code | 260 | |
267 | if (reply.Message == String.Empty) | 261 | if (reply.Message == String.Empty) |
268 | reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved"); | 262 | reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved"); |
269 | 263 | ||
@@ -296,16 +290,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
296 | reply.Message, | 290 | reply.Message, |
297 | false, new Vector3())); | 291 | false, new Vector3())); |
298 | } | 292 | } |
299 | */ | ||
300 | // current opensim and osgrid compatible | ||
301 | client.SendInstantMessage(new GridInstantMessage( | ||
302 | null, new UUID(im.toAgentID), | ||
303 | "System", new UUID(im.fromAgentID), | ||
304 | (byte)InstantMessageDialog.MessageFromAgent, | ||
305 | "User is not logged in. "+ | ||
306 | (success ? "Message saved." : "Message not saved"), | ||
307 | false, new Vector3())); | ||
308 | // current opensim and osgrid compatible end | ||
309 | } | 293 | } |
310 | } | 294 | } |
311 | } | 295 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index bc8aeca..89e3020 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
149 | 149 | ||
150 | if (profileConfig == null) | 150 | if (profileConfig == null) |
151 | { | 151 | { |
152 | m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration"); | 152 | //m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration"); |
153 | Enabled = false; | 153 | Enabled = false; |
154 | return; | 154 | return; |
155 | } | 155 | } |