aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-07-26 17:34:59 +0100
committerUbitUmarov2016-07-26 17:34:59 +0100
commit13ae6dff18a507791b3e05eaef74c2f2066cdfec (patch)
treeda53ba5a6df901b5439267d3cc92ed196946a9f9
parent get a copy of current clientView group powers (diff)
downloadopensim-SC_OLD-13ae6dff18a507791b3e05eaef74c2f2066cdfec.zip
opensim-SC_OLD-13ae6dff18a507791b3e05eaef74c2f2066cdfec.tar.gz
opensim-SC_OLD-13ae6dff18a507791b3e05eaef74c2f2066cdfec.tar.bz2
opensim-SC_OLD-13ae6dff18a507791b3e05eaef74c2f2066cdfec.tar.xz
let some group related data to have a public set
-rw-r--r--OpenSim/Framework/IClientAPI.cs6
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs3
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs3
5 files changed, 14 insertions, 6 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 2495834..0672014 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -727,11 +727,11 @@ namespace OpenSim.Framework
727 727
728 UUID SecureSessionId { get; } 728 UUID SecureSessionId { get; }
729 729
730 UUID ActiveGroupId { get; } 730 UUID ActiveGroupId { get; set; }
731 731
732 string ActiveGroupName { get; } 732 string ActiveGroupName { get; set;}
733 733
734 ulong ActiveGroupPowers { get; } 734 ulong ActiveGroupPowers { get; set;}
735 735
736 Dictionary<UUID, ulong> GetGroupPowers(); 736 Dictionary<UUID, ulong> GetGroupPowers();
737 737
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 39f43ee..2026f78 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -421,9 +421,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
421 } 421 }
422 public UUID AgentId { get { return m_agentId; } } 422 public UUID AgentId { get { return m_agentId; } }
423 public ISceneAgent SceneAgent { get; set; } 423 public ISceneAgent SceneAgent { get; set; }
424 public UUID ActiveGroupId { get { return m_activeGroupID; } private set { m_activeGroupID = value; } } 424 public UUID ActiveGroupId { get { return m_activeGroupID; } set { m_activeGroupID = value; } }
425 public string ActiveGroupName { get { return m_activeGroupName; } private set { m_activeGroupName = value; } } 425 public string ActiveGroupName { get { return m_activeGroupName; } set { m_activeGroupName = value; } }
426 public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } private set { m_activeGroupPowers = value; } } 426 public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } set { m_activeGroupPowers = value; } }
427 public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); } 427 public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); }
428 428
429 public int PingTimeMS 429 public int PingTimeMS
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index ade30a6..7c08d08 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -570,16 +570,19 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
570 public UUID ActiveGroupId 570 public UUID ActiveGroupId
571 { 571 {
572 get { return UUID.Zero; } 572 get { return UUID.Zero; }
573 set {}
573 } 574 }
574 575
575 public string ActiveGroupName 576 public string ActiveGroupName
576 { 577 {
577 get { return "IRCd User"; } 578 get { return "IRCd User"; }
579 set {}
578 } 580 }
579 581
580 public ulong ActiveGroupPowers 582 public ulong ActiveGroupPowers
581 { 583 {
582 get { return 0; } 584 get { return 0; }
585 set {}
583 } 586 }
584 587
585 public Dictionary<UUID, ulong> GetGroupPowers() 588 public Dictionary<UUID, ulong> GetGroupPowers()
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 7cfa360..a84520fe 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -591,11 +591,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC
591 public string ActiveGroupName 591 public string ActiveGroupName
592 { 592 {
593 get { return String.Empty; } 593 get { return String.Empty; }
594 set { }
594 } 595 }
595 596
596 public ulong ActiveGroupPowers 597 public ulong ActiveGroupPowers
597 { 598 {
598 get { return 0; } 599 get { return 0; }
600 set { }
599 } 601 }
600 602
601 public bool IsGroupMember(UUID groupID) 603 public bool IsGroupMember(UUID groupID)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index cc87a54..83328c8 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -404,16 +404,19 @@ namespace OpenSim.Tests.Common
404 public UUID ActiveGroupId 404 public UUID ActiveGroupId
405 { 405 {
406 get { return UUID.Zero; } 406 get { return UUID.Zero; }
407 set { }
407 } 408 }
408 409
409 public string ActiveGroupName 410 public string ActiveGroupName
410 { 411 {
411 get { return String.Empty; } 412 get { return String.Empty; }
413 set { }
412 } 414 }
413 415
414 public ulong ActiveGroupPowers 416 public ulong ActiveGroupPowers
415 { 417 {
416 get { return 0; } 418 get { return 0; }
419 set { }
417 } 420 }
418 421
419 public bool IsGroupMember(UUID groupID) 422 public bool IsGroupMember(UUID groupID)