aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-05-20 16:19:35 +0000
committerSean Dague2008-05-20 16:19:35 +0000
commit185eff8d0d588161c301d868fc31c9f0177ba945 (patch)
treeb0df82b4ebd574173d62c4476adeafd5ce3e2a44
parentAdd copyright notices. (diff)
downloadopensim-SC-185eff8d0d588161c301d868fc31c9f0177ba945.zip
opensim-SC-185eff8d0d588161c301d868fc31c9f0177ba945.tar.gz
opensim-SC-185eff8d0d588161c301d868fc31c9f0177ba945.tar.bz2
opensim-SC-185eff8d0d588161c301d868fc31c9f0177ba945.tar.xz
From: Jeremy Bongio <jbongio@us.ibm.com>
House cleaning ... Rather than using the variable name EntityList, the variable name EntitieList was being used. Here's a patch to fix it.
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
4 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 7a460a2..62055d8 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1267,8 +1267,8 @@ namespace OpenSim.Region.Environment.Scenes
1267 1267
1268 Dictionary<uint, SceneObjectGroup> sceneObjects = new Dictionary<uint, SceneObjectGroup>(); 1268 Dictionary<uint, SceneObjectGroup> sceneObjects = new Dictionary<uint, SceneObjectGroup>();
1269 1269
1270 List<EntityBase> EntitieList = GetEntities(); 1270 List<EntityBase> EntityList = GetEntities();
1271 foreach (EntityBase ent in EntitieList) 1271 foreach (EntityBase ent in EntityList)
1272 { 1272 {
1273 if (ent is SceneObjectGroup) 1273 if (ent is SceneObjectGroup)
1274 { 1274 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 53ae28f..4f65beb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -741,9 +741,9 @@ namespace OpenSim.Region.Environment.Scenes
741 741
742 private SceneObjectGroup GetGroupByPrim(uint localID) 742 private SceneObjectGroup GetGroupByPrim(uint localID)
743 { 743 {
744 List<EntityBase> EntitieList = GetEntities(); 744 List<EntityBase> EntityList = GetEntities();
745 745
746 foreach (EntityBase ent in EntitieList) 746 foreach (EntityBase ent in EntityList)
747 { 747 {
748 if (ent is SceneObjectGroup) 748 if (ent is SceneObjectGroup)
749 { 749 {
@@ -1060,9 +1060,9 @@ namespace OpenSim.Region.Environment.Scenes
1060 EntityBase selectedEnt = null; 1060 EntityBase selectedEnt = null;
1061 //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString()); 1061 //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString());
1062 1062
1063 List<EntityBase> EntitieList = GetEntities(); 1063 List<EntityBase> EntityList = GetEntities();
1064 1064
1065 foreach (EntityBase ent in EntitieList) 1065 foreach (EntityBase ent in EntityList)
1066 { 1066 {
1067 if (ent.LocalId == Data.ObjectLocalID) 1067 if (ent.LocalId == Data.ObjectLocalID)
1068 { 1068 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index b2f1dec..2facf68 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -76,9 +76,9 @@ namespace OpenSim.Region.Environment.Scenes
76 /// <param name="remoteClient"></param> 76 /// <param name="remoteClient"></param>
77 public void SelectPrim(uint primLocalID, IClientAPI remoteClient) 77 public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
78 { 78 {
79 List<EntityBase> EntitieList = GetEntities(); 79 List<EntityBase> EntityList = GetEntities();
80 80
81 foreach (EntityBase ent in EntitieList) 81 foreach (EntityBase ent in EntityList)
82 { 82 {
83 if (ent is SceneObjectGroup) 83 if (ent is SceneObjectGroup)
84 { 84 {
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Scenes
104 /// <param name="remoteClient"></param> 104 /// <param name="remoteClient"></param>
105 public void DeselectPrim(uint primLocalID, IClientAPI remoteClient) 105 public void DeselectPrim(uint primLocalID, IClientAPI remoteClient)
106 { 106 {
107 List<EntityBase> EntitieList = GetEntities(); 107 List<EntityBase> EntityList = GetEntities();
108 108
109 foreach (EntityBase ent in EntitieList) 109 foreach (EntityBase ent in EntityList)
110 { 110 {
111 if (ent is SceneObjectGroup) 111 if (ent is SceneObjectGroup)
112 { 112 {
@@ -148,9 +148,9 @@ namespace OpenSim.Region.Environment.Scenes
148 public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) 148 public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
149 { 149 {
150 150
151 List<EntityBase> EntitieList = GetEntities(); 151 List<EntityBase> EntityList = GetEntities();
152 152
153 foreach (EntityBase ent in EntitieList) 153 foreach (EntityBase ent in EntityList)
154 { 154 {
155 if (ent is SceneObjectGroup) 155 if (ent is SceneObjectGroup)
156 { 156 {
@@ -183,9 +183,9 @@ namespace OpenSim.Region.Environment.Scenes
183 public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient) 183 public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient)
184 { 184 {
185 185
186 List<EntityBase> EntitieList = GetEntities(); 186 List<EntityBase> EntityList = GetEntities();
187 187
188 foreach (EntityBase ent in EntitieList) 188 foreach (EntityBase ent in EntityList)
189 { 189 {
190 if (ent is SceneObjectGroup) 190 if (ent is SceneObjectGroup)
191 { 191 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index b2d45d1..56d114c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2762,9 +2762,9 @@ namespace OpenSim.Region.Environment.Scenes
2762 /// </summary> 2762 /// </summary>
2763 public void ForceClientUpdate() 2763 public void ForceClientUpdate()
2764 { 2764 {
2765 List<EntityBase> EntitieList = GetEntities(); 2765 List<EntityBase> EntityList = GetEntities();
2766 2766
2767 foreach (EntityBase ent in EntitieList) 2767 foreach (EntityBase ent in EntityList)
2768 { 2768 {
2769 if (ent is SceneObjectGroup) 2769 if (ent is SceneObjectGroup)
2770 { 2770 {
@@ -2782,9 +2782,9 @@ namespace OpenSim.Region.Environment.Scenes
2782 { 2782 {
2783 Console.WriteLine("Searching for Primitive: '" + cmdparams[0] + "'"); 2783 Console.WriteLine("Searching for Primitive: '" + cmdparams[0] + "'");
2784 2784
2785 List<EntityBase> EntitieList = GetEntities(); 2785 List<EntityBase> EntityList = GetEntities();
2786 2786
2787 foreach (EntityBase ent in EntitieList) 2787 foreach (EntityBase ent in EntityList)
2788 { 2788 {
2789 if (ent is SceneObjectGroup) 2789 if (ent is SceneObjectGroup)
2790 { 2790 {