diff options
author | Diva Canto | 2010-06-19 13:52:21 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-19 13:52:21 -0700 |
commit | 77d892690aac2808d7a050c13dd6bd642a403334 (patch) | |
tree | 591565bd1379cd1d496edb7e54a1963aa1391e6d /OpenSim | |
parent | remove link to wiki mysql-config since the page was out-of-date and actively ... (diff) | |
parent | Bug fix: wrong name of requester in local friendship offer. (diff) | |
download | opensim-SC_OLD-77d892690aac2808d7a050c13dd6bd642a403334.zip opensim-SC_OLD-77d892690aac2808d7a050c13dd6bd642a403334.tar.gz opensim-SC_OLD-77d892690aac2808d7a050c13dd6bd642a403334.tar.bz2 opensim-SC_OLD-77d892690aac2808d7a050c13dd6bd642a403334.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim')
4 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index a46a6cb..c038aac 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console | |||
44 | { | 44 | { |
45 | public int last; | 45 | public int last; |
46 | public long lastLineSeen; | 46 | public long lastLineSeen; |
47 | public bool newConnection = true; | ||
47 | } | 48 | } |
48 | 49 | ||
49 | // A console that uses REST interfaces | 50 | // A console that uses REST interfaces |
@@ -424,6 +425,12 @@ namespace OpenSim.Framework.Console | |||
424 | XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession", | 425 | XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession", |
425 | ""); | 426 | ""); |
426 | 427 | ||
428 | if (c.newConnection) | ||
429 | { | ||
430 | c.newConnection = false; | ||
431 | Output("+++" + DefaultPrompt); | ||
432 | } | ||
433 | |||
427 | lock (m_Scrollback) | 434 | lock (m_Scrollback) |
428 | { | 435 | { |
429 | long startLine = m_LineNumber - m_Scrollback.Count; | 436 | long startLine = m_LineNumber - m_Scrollback.Count; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 80982fd..5552be7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
503 | UUID principalID = new UUID(im.fromAgentID); | 503 | UUID principalID = new UUID(im.fromAgentID); |
504 | UUID friendID = new UUID(im.toAgentID); | 504 | UUID friendID = new UUID(im.toAgentID); |
505 | 505 | ||
506 | m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID); | 506 | m_log.DebugFormat("[FRIENDS]: {0} ({1}) offered friendship to {2}", principalID, im.fromAgentName, friendID); |
507 | 507 | ||
508 | // This user wants to be friends with the other user. | 508 | // This user wants to be friends with the other user. |
509 | // Let's add the relation backwards, in case the other is not online | 509 | // Let's add the relation backwards, in case the other is not online |
@@ -521,6 +521,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
521 | im.imSessionID = im.fromAgentID; | 521 | im.imSessionID = im.fromAgentID; |
522 | 522 | ||
523 | // Try the local sim | 523 | // Try the local sim |
524 | UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID); | ||
525 | im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; | ||
526 | |||
524 | if (LocalFriendshipOffered(friendID, im)) | 527 | if (LocalFriendshipOffered(friendID, im)) |
525 | return; | 528 | return; |
526 | 529 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 38b2dc2..59fd805 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1487,6 +1487,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1487 | DoPhysicsPropertyUpdate(RigidBody, true); | 1487 | DoPhysicsPropertyUpdate(RigidBody, true); |
1488 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); | 1488 | PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); |
1489 | } | 1489 | } |
1490 | else | ||
1491 | { | ||
1492 | m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); | ||
1493 | } | ||
1490 | } | 1494 | } |
1491 | } | 1495 | } |
1492 | } | 1496 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 100f98d..7fd59a0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); | 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); |
1782 | m_log.Debug(e.ToString()); | 1782 | m_log.Debug(e.ToString()); |
1783 | mesh = null; | 1783 | mesh = null; |
1784 | return null; | ||
1784 | } | 1785 | } |
1785 | } | 1786 | } |
1786 | 1787 | ||