aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorUbitUmarov2017-01-19 19:01:56 +0000
committerUbitUmarov2017-01-19 19:01:56 +0000
commit69bcbd856b8785b2912fa4ceac7411967756107c (patch)
tree81c322e6ea426580044ede6b05934fb660fdcf38 /OpenSim/Region/OptionalModules
parentactually make use of it as viewers requested (diff)
downloadopensim-SC_OLD-69bcbd856b8785b2912fa4ceac7411967756107c.zip
opensim-SC_OLD-69bcbd856b8785b2912fa4ceac7411967756107c.tar.gz
opensim-SC_OLD-69bcbd856b8785b2912fa4ceac7411967756107c.tar.bz2
opensim-SC_OLD-69bcbd856b8785b2912fa4ceac7411967756107c.tar.xz
change CanDuplicateObject
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 9c0fa75..4875a61 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.OptionalModules
106 106
107 private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition, Scene scene) 107 private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition, Scene scene)
108 { 108 {
109
109 ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); 110 ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
110 111
111 string response = DoCommonChecks(objectCount, ownerID, lo, scene); 112 string response = DoCommonChecks(objectCount, ownerID, lo, scene);
@@ -119,15 +120,16 @@ namespace OpenSim.Region.OptionalModules
119 } 120 }
120 121
121 //OnDuplicateObject 122 //OnDuplicateObject
122 private bool CanDuplicateObject(int objectCount, UUID objectID, UUID ownerID, Scene scene, Vector3 objectPosition) 123 private bool CanDuplicateObject(SceneObjectGroup sog, ScenePresence sp, Scene scene)
123 { 124 {
125 Vector3 objectPosition = sog.AbsolutePosition;
124 ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); 126 ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
125 127
126 string response = DoCommonChecks(objectCount, ownerID, lo, scene); 128 string response = DoCommonChecks(sog.PrimCount, sp.UUID, lo, scene);
127 129
128 if (response != null) 130 if (response != null)
129 { 131 {
130 m_dialogModule.SendAlertToUser(ownerID, response); 132 m_dialogModule.SendAlertToUser(sp.UUID, response);
131 return false; 133 return false;
132 } 134 }
133 return true; 135 return true;