aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-23 20:20:40 +0000
committerMelanie Thielker2008-09-23 20:20:40 +0000
commitbbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9 (patch)
tree1aba127a8114b5a93e50e39cf24b83ba8a69ced7 /OpenSim/Region
parentRemove some debug output (diff)
downloadopensim-SC_OLD-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.zip
opensim-SC_OLD-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.gz
opensim-SC_OLD-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.bz2
opensim-SC_OLD-bbb962f64efd7fe0eafd3c4c9ffb77fcaf003fd9.tar.xz
Refactor BuiltIn_Commands_BaseClass to ScriptBaseClass to ease the later
code merging and transition to Shared/
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs416
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT4
3 files changed, 214 insertions, 214 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index ade6d04..de7ca08 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -164,12 +164,12 @@ namespace OpenSim.Region.ScriptEngine.Common
164 164
165 switch (linkType) 165 switch (linkType)
166 { 166 {
167 case BuiltIn_Commands_BaseClass.LINK_SET: 167 case ScriptBaseClass.LINK_SET:
168 if (m_host.ParentGroup != null) 168 if (m_host.ParentGroup != null)
169 return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values); 169 return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
170 return ret; 170 return ret;
171 171
172 case BuiltIn_Commands_BaseClass.LINK_ROOT: 172 case ScriptBaseClass.LINK_ROOT:
173 if (m_host.ParentGroup != null) 173 if (m_host.ParentGroup != null)
174 { 174 {
175 ret = new List<SceneObjectPart>(); 175 ret = new List<SceneObjectPart>();
@@ -178,7 +178,7 @@ namespace OpenSim.Region.ScriptEngine.Common
178 } 178 }
179 return ret; 179 return ret;
180 180
181 case BuiltIn_Commands_BaseClass.LINK_ALL_OTHERS: 181 case ScriptBaseClass.LINK_ALL_OTHERS:
182 if (m_host.ParentGroup == null) 182 if (m_host.ParentGroup == null)
183 return new List<SceneObjectPart>(); 183 return new List<SceneObjectPart>();
184 ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values); 184 ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Common
186 ret.Remove(m_host); 186 ret.Remove(m_host);
187 return ret; 187 return ret;
188 188
189 case BuiltIn_Commands_BaseClass.LINK_ALL_CHILDREN: 189 case ScriptBaseClass.LINK_ALL_CHILDREN:
190 if (m_host.ParentGroup == null) 190 if (m_host.ParentGroup == null)
191 return new List<SceneObjectPart>(); 191 return new List<SceneObjectPart>();
192 ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values); 192 ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
@@ -194,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Common
194 ret.Remove(m_host.ParentGroup.RootPart); 194 ret.Remove(m_host.ParentGroup.RootPart);
195 return ret; 195 return ret;
196 196
197 case BuiltIn_Commands_BaseClass.LINK_THIS: 197 case ScriptBaseClass.LINK_THIS:
198 return ret; 198 return ret;
199 199
200 default: 200 default:
@@ -1085,7 +1085,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1085 1085
1086 int statusrotationaxis = 0; 1086 int statusrotationaxis = 0;
1087 1087
1088 if ((status & BuiltIn_Commands_BaseClass.STATUS_PHYSICS) == BuiltIn_Commands_BaseClass.STATUS_PHYSICS) 1088 if ((status & ScriptBaseClass.STATUS_PHYSICS) == ScriptBaseClass.STATUS_PHYSICS)
1089 { 1089 {
1090 if (value == 1) 1090 if (value == 1)
1091 { 1091 {
@@ -1110,7 +1110,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1110 m_host.ScriptSetPhysicsStatus(false); 1110 m_host.ScriptSetPhysicsStatus(false);
1111 } 1111 }
1112 1112
1113 if ((status & BuiltIn_Commands_BaseClass.STATUS_PHANTOM) == BuiltIn_Commands_BaseClass.STATUS_PHANTOM) 1113 if ((status & ScriptBaseClass.STATUS_PHANTOM) == ScriptBaseClass.STATUS_PHANTOM)
1114 { 1114 {
1115 if (value == 1) 1115 if (value == 1)
1116 m_host.ScriptSetPhantomStatus(true); 1116 m_host.ScriptSetPhantomStatus(true);
@@ -1118,32 +1118,32 @@ namespace OpenSim.Region.ScriptEngine.Common
1118 m_host.ScriptSetPhantomStatus(false); 1118 m_host.ScriptSetPhantomStatus(false);
1119 } 1119 }
1120 1120
1121 if ((status & BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS) == BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS) 1121 if ((status & ScriptBaseClass.STATUS_CAST_SHADOWS) == ScriptBaseClass.STATUS_CAST_SHADOWS)
1122 { 1122 {
1123 m_host.AddFlag(PrimFlags.CastShadows); 1123 m_host.AddFlag(PrimFlags.CastShadows);
1124 } 1124 }
1125 1125
1126 if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_X) 1126 if ((status & ScriptBaseClass.STATUS_ROTATE_X) == ScriptBaseClass.STATUS_ROTATE_X)
1127 { 1127 {
1128 statusrotationaxis |= BuiltIn_Commands_BaseClass.STATUS_ROTATE_X; 1128 statusrotationaxis |= ScriptBaseClass.STATUS_ROTATE_X;
1129 } 1129 }
1130 1130
1131 if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y) 1131 if ((status & ScriptBaseClass.STATUS_ROTATE_Y) == ScriptBaseClass.STATUS_ROTATE_Y)
1132 { 1132 {
1133 statusrotationaxis |= BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y; 1133 statusrotationaxis |= ScriptBaseClass.STATUS_ROTATE_Y;
1134 } 1134 }
1135 1135
1136 if ((status & BuiltIn_Commands_BaseClass.STATUS_ROTATE_Z) == BuiltIn_Commands_BaseClass.STATUS_ROTATE_Z) 1136 if ((status & ScriptBaseClass.STATUS_ROTATE_Z) == ScriptBaseClass.STATUS_ROTATE_Z)
1137 { 1137 {
1138 statusrotationaxis |= BuiltIn_Commands_BaseClass.STATUS_ROTATE_Z; 1138 statusrotationaxis |= ScriptBaseClass.STATUS_ROTATE_Z;
1139 } 1139 }
1140 1140
1141 if ((status & BuiltIn_Commands_BaseClass.STATUS_BLOCK_GRAB) == BuiltIn_Commands_BaseClass.STATUS_BLOCK_GRAB) 1141 if ((status & ScriptBaseClass.STATUS_BLOCK_GRAB) == ScriptBaseClass.STATUS_BLOCK_GRAB)
1142 { 1142 {
1143 NotImplemented("llSetStatus - STATUS_BLOCK_GRAB"); 1143 NotImplemented("llSetStatus - STATUS_BLOCK_GRAB");
1144 } 1144 }
1145 1145
1146 if ((status & BuiltIn_Commands_BaseClass.STATUS_DIE_AT_EDGE) == BuiltIn_Commands_BaseClass.STATUS_DIE_AT_EDGE) 1146 if ((status & ScriptBaseClass.STATUS_DIE_AT_EDGE) == ScriptBaseClass.STATUS_DIE_AT_EDGE)
1147 { 1147 {
1148 if (value == 1) 1148 if (value == 1)
1149 m_host.SetDieAtEdge(true); 1149 m_host.SetDieAtEdge(true);
@@ -1151,12 +1151,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1151 m_host.SetDieAtEdge(false); 1151 m_host.SetDieAtEdge(false);
1152 } 1152 }
1153 1153
1154 if ((status & BuiltIn_Commands_BaseClass.STATUS_RETURN_AT_EDGE) == BuiltIn_Commands_BaseClass.STATUS_RETURN_AT_EDGE) 1154 if ((status & ScriptBaseClass.STATUS_RETURN_AT_EDGE) == ScriptBaseClass.STATUS_RETURN_AT_EDGE)
1155 { 1155 {
1156 NotImplemented("llSetStatus - STATUS_RETURN_AT_EDGE"); 1156 NotImplemented("llSetStatus - STATUS_RETURN_AT_EDGE");
1157 } 1157 }
1158 1158
1159 if ((status & BuiltIn_Commands_BaseClass.STATUS_SANDBOX) == BuiltIn_Commands_BaseClass.STATUS_SANDBOX) 1159 if ((status & ScriptBaseClass.STATUS_SANDBOX) == ScriptBaseClass.STATUS_SANDBOX)
1160 { 1160 {
1161 NotImplemented("llSetStatus - STATUS_SANDBOX"); 1161 NotImplemented("llSetStatus - STATUS_SANDBOX");
1162 } 1162 }
@@ -1173,54 +1173,54 @@ namespace OpenSim.Region.ScriptEngine.Common
1173 // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); 1173 // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString());
1174 switch (status) 1174 switch (status)
1175 { 1175 {
1176 case BuiltIn_Commands_BaseClass.STATUS_PHYSICS: 1176 case ScriptBaseClass.STATUS_PHYSICS:
1177 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == (uint)PrimFlags.Physics) 1177 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) == (uint)PrimFlags.Physics)
1178 { 1178 {
1179 return 1; 1179 return 1;
1180 } 1180 }
1181 return 0; 1181 return 0;
1182 1182
1183 case BuiltIn_Commands_BaseClass.STATUS_PHANTOM: 1183 case ScriptBaseClass.STATUS_PHANTOM:
1184 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) == (uint)PrimFlags.Phantom) 1184 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) == (uint)PrimFlags.Phantom)
1185 { 1185 {
1186 return 1; 1186 return 1;
1187 } 1187 }
1188 return 0; 1188 return 0;
1189 1189
1190 case BuiltIn_Commands_BaseClass.STATUS_CAST_SHADOWS: 1190 case ScriptBaseClass.STATUS_CAST_SHADOWS:
1191 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.CastShadows) == (uint)PrimFlags.CastShadows) 1191 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.CastShadows) == (uint)PrimFlags.CastShadows)
1192 { 1192 {
1193 return 1; 1193 return 1;
1194 } 1194 }
1195 return 0; 1195 return 0;
1196 1196
1197 case BuiltIn_Commands_BaseClass.STATUS_BLOCK_GRAB: 1197 case ScriptBaseClass.STATUS_BLOCK_GRAB:
1198 NotImplemented("llGetStatus - STATUS_BLOCK_GRAB"); 1198 NotImplemented("llGetStatus - STATUS_BLOCK_GRAB");
1199 return 0; 1199 return 0;
1200 1200
1201 case BuiltIn_Commands_BaseClass.STATUS_DIE_AT_EDGE: 1201 case ScriptBaseClass.STATUS_DIE_AT_EDGE:
1202 if (m_host.GetDieAtEdge()) 1202 if (m_host.GetDieAtEdge())
1203 return 1; 1203 return 1;
1204 else 1204 else
1205 return 0; 1205 return 0;
1206 1206
1207 case BuiltIn_Commands_BaseClass.STATUS_RETURN_AT_EDGE: 1207 case ScriptBaseClass.STATUS_RETURN_AT_EDGE:
1208 NotImplemented("llGetStatus - STATUS_RETURN_AT_EDGE"); 1208 NotImplemented("llGetStatus - STATUS_RETURN_AT_EDGE");
1209 return 0; 1209 return 0;
1210 1210
1211 case BuiltIn_Commands_BaseClass.STATUS_ROTATE_X: 1211 case ScriptBaseClass.STATUS_ROTATE_X:
1212 NotImplemented("llGetStatus - STATUS_ROTATE_X"); 1212 NotImplemented("llGetStatus - STATUS_ROTATE_X");
1213 return 0; 1213 return 0;
1214 1214
1215 case BuiltIn_Commands_BaseClass.STATUS_ROTATE_Y: 1215 case ScriptBaseClass.STATUS_ROTATE_Y:
1216 NotImplemented("llGetStatus - STATUS_ROTATE_Y"); 1216 NotImplemented("llGetStatus - STATUS_ROTATE_Y");
1217 return 0; 1217 return 0;
1218 1218
1219 case BuiltIn_Commands_BaseClass.STATUS_ROTATE_Z: 1219 case ScriptBaseClass.STATUS_ROTATE_Z:
1220 NotImplemented("llGetStatus - STATUS_ROTATE_Z"); 1220 NotImplemented("llGetStatus - STATUS_ROTATE_Z");
1221 return 0; 1221 return 0;
1222 1222
1223 case BuiltIn_Commands_BaseClass.STATUS_SANDBOX: 1223 case ScriptBaseClass.STATUS_SANDBOX:
1224 NotImplemented("llGetStatus - STATUS_SANDBOX"); 1224 NotImplemented("llGetStatus - STATUS_SANDBOX");
1225 return 0; 1225 return 0;
1226 } 1226 }
@@ -1297,7 +1297,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1297 part.UpdateTexture(tex); 1297 part.UpdateTexture(tex);
1298 return; 1298 return;
1299 } 1299 }
1300 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1300 else if (face == ScriptBaseClass.ALL_SIDES)
1301 { 1301 {
1302 for (uint i = 0; i < GetNumberOfSides(part); i++) 1302 for (uint i = 0; i < GetNumberOfSides(part); i++)
1303 { 1303 {
@@ -1330,7 +1330,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1330 part.UpdateTexture(tex); 1330 part.UpdateTexture(tex);
1331 return; 1331 return;
1332 } 1332 }
1333 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1333 else if (face == ScriptBaseClass.ALL_SIDES)
1334 { 1334 {
1335 for (uint i = 0; i < GetNumberOfSides(part); i++) 1335 for (uint i = 0; i < GetNumberOfSides(part); i++)
1336 { 1336 {
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1378 part.UpdateTexture(tex); 1378 part.UpdateTexture(tex);
1379 return; 1379 return;
1380 } 1380 }
1381 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1381 else if (face == ScriptBaseClass.ALL_SIDES)
1382 { 1382 {
1383 for (uint i = 0; i < GetNumberOfSides(part); i++) 1383 for (uint i = 0; i < GetNumberOfSides(part); i++)
1384 { 1384 {
@@ -1405,7 +1405,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1405 part.UpdateTexture(tex); 1405 part.UpdateTexture(tex);
1406 return; 1406 return;
1407 } 1407 }
1408 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1408 else if (face == ScriptBaseClass.ALL_SIDES)
1409 { 1409 {
1410 for (uint i = 0; i < GetNumberOfSides(part); i++) 1410 for (uint i = 0; i < GetNumberOfSides(part); i++)
1411 { 1411 {
@@ -1429,7 +1429,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1429 private LSL_Float GetAlpha(SceneObjectPart part, int face) 1429 private LSL_Float GetAlpha(SceneObjectPart part, int face)
1430 { 1430 {
1431 Primitive.TextureEntry tex = part.Shape.Textures; 1431 Primitive.TextureEntry tex = part.Shape.Textures;
1432 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1432 if (face == ScriptBaseClass.ALL_SIDES)
1433 { 1433 {
1434 int i; 1434 int i;
1435 double sum = 0.0; 1435 double sum = 0.0;
@@ -1463,7 +1463,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1463 part.UpdateTexture(tex); 1463 part.UpdateTexture(tex);
1464 return; 1464 return;
1465 } 1465 }
1466 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1466 else if (face == ScriptBaseClass.ALL_SIDES)
1467 { 1467 {
1468 for (int i = 0; i < GetNumberOfSides(part); i++) 1468 for (int i = 0; i < GetNumberOfSides(part); i++)
1469 { 1469 {
@@ -1589,7 +1589,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1589 Primitive.TextureEntry tex = part.Shape.Textures; 1589 Primitive.TextureEntry tex = part.Shape.Textures;
1590 Color4 texcolor; 1590 Color4 texcolor;
1591 LSL_Vector rgb = new LSL_Vector(); 1591 LSL_Vector rgb = new LSL_Vector();
1592 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1592 if (face == ScriptBaseClass.ALL_SIDES)
1593 { 1593 {
1594 int i; 1594 int i;
1595 1595
@@ -1650,7 +1650,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1650 part.UpdateTexture(tex); 1650 part.UpdateTexture(tex);
1651 return; 1651 return;
1652 } 1652 }
1653 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1653 else if (face == ScriptBaseClass.ALL_SIDES)
1654 { 1654 {
1655 for (uint i = 0; i < GetNumberOfSides(part); i++) 1655 for (uint i = 0; i < GetNumberOfSides(part); i++)
1656 { 1656 {
@@ -1685,7 +1685,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1685 part.UpdateTexture(tex); 1685 part.UpdateTexture(tex);
1686 return; 1686 return;
1687 } 1687 }
1688 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1688 if (face == ScriptBaseClass.ALL_SIDES)
1689 { 1689 {
1690 for (int i = 0; i < GetNumberOfSides(part); i++) 1690 for (int i = 0; i < GetNumberOfSides(part); i++)
1691 { 1691 {
@@ -1721,7 +1721,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1721 part.UpdateTexture(tex); 1721 part.UpdateTexture(tex);
1722 return; 1722 return;
1723 } 1723 }
1724 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1724 if (face == ScriptBaseClass.ALL_SIDES)
1725 { 1725 {
1726 for (int i = 0; i < GetNumberOfSides(part); i++) 1726 for (int i = 0; i < GetNumberOfSides(part); i++)
1727 { 1727 {
@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1756 part.UpdateTexture(tex); 1756 part.UpdateTexture(tex);
1757 return; 1757 return;
1758 } 1758 }
1759 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1759 if (face == ScriptBaseClass.ALL_SIDES)
1760 { 1760 {
1761 for (int i = 0; i < GetNumberOfSides(part); i++) 1761 for (int i = 0; i < GetNumberOfSides(part); i++)
1762 { 1762 {
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1780 private LSL_String GetTexture(SceneObjectPart part, int face) 1780 private LSL_String GetTexture(SceneObjectPart part, int face)
1781 { 1781 {
1782 Primitive.TextureEntry tex = part.Shape.Textures; 1782 Primitive.TextureEntry tex = part.Shape.Textures;
1783 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 1783 if (face == ScriptBaseClass.ALL_SIDES)
1784 { 1784 {
1785 face = 0; 1785 face = 0;
1786 } 1786 }
@@ -2379,7 +2379,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2379 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 2379 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
2380 return 0; 2380 return 0;
2381 2381
2382 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_DEBIT) == 0) 2382 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0)
2383 { 2383 {
2384 LSLError("No permissions to give money"); 2384 LSLError("No permissions to give money");
2385 return 0; 2385 return 0;
@@ -2559,7 +2559,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2559 2559
2560 if (presence != null) 2560 if (presence != null)
2561 { 2561 {
2562 if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) 2562 if ((m_host.TaskInventory[InventorySelf()].PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
2563 { 2563 {
2564 presence.RegisterControlEventsToScript(controls, accept, pass_on, m_localID, m_itemID); 2564 presence.RegisterControlEventsToScript(controls, accept, pass_on, m_localID, m_itemID);
2565 2565
@@ -2585,12 +2585,12 @@ namespace OpenSim.Region.ScriptEngine.Common
2585 2585
2586 if (presence != null) 2586 if (presence != null)
2587 { 2587 {
2588 if ((m_host.TaskInventory[InventorySelf()].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) != 0) 2588 if ((m_host.TaskInventory[InventorySelf()].PermsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
2589 { 2589 {
2590 // Unregister controls from Presence 2590 // Unregister controls from Presence
2591 presence.UnRegisterControlEventsToScript(m_localID, m_itemID); 2591 presence.UnRegisterControlEventsToScript(m_localID, m_itemID);
2592 // Remove Take Control permission. 2592 // Remove Take Control permission.
2593 m_host.TaskInventory[InventorySelf()].PermsMask &= ~BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS; 2593 m_host.TaskInventory[InventorySelf()].PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
2594 } 2594 }
2595 } 2595 }
2596 } 2596 }
@@ -2763,7 +2763,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2763 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 2763 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
2764 return; 2764 return;
2765 2765
2766 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) 2766 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
2767 { 2767 {
2768 ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); 2768 ScenePresence presence = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter);
2769 2769
@@ -2790,7 +2790,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2790 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 2790 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
2791 return; 2791 return;
2792 2792
2793 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION) != 0) 2793 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION) != 0)
2794 { 2794 {
2795 UUID animID = new UUID(); 2795 UUID animID = new UUID();
2796 2796
@@ -2872,7 +2872,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2872 return; 2872 return;
2873 } 2873 }
2874 2874
2875 if ( m_host.TaskInventory[invItemID].PermsGranter != agentID || (perm & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) == 0) 2875 if ( m_host.TaskInventory[invItemID].PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
2876 llReleaseControls(); 2876 llReleaseControls();
2877 2877
2878 m_host.AddScriptLPS(1); 2878 m_host.AddScriptLPS(1);
@@ -2880,10 +2880,10 @@ namespace OpenSim.Region.ScriptEngine.Common
2880 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar) 2880 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2881 { 2881 {
2882 // When attached, certain permissions are implicit if requested from owner 2882 // When attached, certain permissions are implicit if requested from owner
2883 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS | 2883 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
2884 BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | 2884 ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
2885 BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA | 2885 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
2886 BuiltIn_Commands_BaseClass.PERMISSION_ATTACH; 2886 ScriptBaseClass.PERMISSION_ATTACH;
2887 2887
2888 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 2888 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
2889 { 2889 {
@@ -2901,9 +2901,9 @@ namespace OpenSim.Region.ScriptEngine.Common
2901 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar 2901 else if (m_host.SitTargetAvatar == agentID) // Sitting avatar
2902 { 2902 {
2903 // When agent is sitting, certain permissions are implicit if requested from sitting agent 2903 // When agent is sitting, certain permissions are implicit if requested from sitting agent
2904 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | 2904 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
2905 BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA | 2905 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
2906 BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA; 2906 ScriptBaseClass.PERMISSION_TRACK_CAMERA;
2907 2907
2908 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 2908 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
2909 { 2909 {
@@ -2959,7 +2959,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2959 client.OnScriptAnswer-=handleScriptAnswer; 2959 client.OnScriptAnswer-=handleScriptAnswer;
2960 m_waitingForScriptAnswer=false; 2960 m_waitingForScriptAnswer=false;
2961 2961
2962 if ((answer & BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS) == 0) 2962 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
2963 llReleaseControls(); 2963 llReleaseControls();
2964 2964
2965 m_host.TaskInventory[invItemID].PermsMask=answer; 2965 m_host.TaskInventory[invItemID].PermsMask=answer;
@@ -3111,7 +3111,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3111 { 3111 {
3112 m_host.AddScriptLPS(1); 3112 m_host.AddScriptLPS(1);
3113 UUID invItemID = InventorySelf(); 3113 UUID invItemID = InventorySelf();
3114 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CHANGE_LINKS) == 0) { 3114 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0) {
3115 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3115 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3116 return; 3116 return;
3117 } 3117 }
@@ -3147,23 +3147,23 @@ namespace OpenSim.Region.ScriptEngine.Common
3147 { 3147 {
3148 m_host.AddScriptLPS(1); 3148 m_host.AddScriptLPS(1);
3149 UUID invItemID = InventorySelf(); 3149 UUID invItemID = InventorySelf();
3150 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CHANGE_LINKS) == 0) 3150 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0)
3151 { 3151 {
3152 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3152 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3153 return; 3153 return;
3154 } 3154 }
3155 if (linknum < BuiltIn_Commands_BaseClass.LINK_THIS) 3155 if (linknum < ScriptBaseClass.LINK_THIS)
3156 return; 3156 return;
3157 SceneObjectGroup parentPrim = m_host.ParentGroup; 3157 SceneObjectGroup parentPrim = m_host.ParentGroup;
3158 SceneObjectPart childPrim = null; 3158 SceneObjectPart childPrim = null;
3159 switch (linknum) 3159 switch (linknum)
3160 { 3160 {
3161 case BuiltIn_Commands_BaseClass.LINK_ROOT: 3161 case ScriptBaseClass.LINK_ROOT:
3162 break; 3162 break;
3163 case BuiltIn_Commands_BaseClass.LINK_SET: 3163 case ScriptBaseClass.LINK_SET:
3164 case BuiltIn_Commands_BaseClass.LINK_ALL_OTHERS: 3164 case ScriptBaseClass.LINK_ALL_OTHERS:
3165 case BuiltIn_Commands_BaseClass.LINK_ALL_CHILDREN: 3165 case ScriptBaseClass.LINK_ALL_CHILDREN:
3166 case BuiltIn_Commands_BaseClass.LINK_THIS: 3166 case ScriptBaseClass.LINK_THIS:
3167 foreach (SceneObjectPart part in parentPrim.Children.Values) 3167 foreach (SceneObjectPart part in parentPrim.Children.Values)
3168 { 3168 {
3169 if (part.UUID != m_host.UUID) 3169 if (part.UUID != m_host.UUID)
@@ -3179,7 +3179,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3179 childPrim = null; 3179 childPrim = null;
3180 break; 3180 break;
3181 } 3181 }
3182 if (linknum == BuiltIn_Commands_BaseClass.LINK_ROOT) 3182 if (linknum == ScriptBaseClass.LINK_ROOT)
3183 { 3183 {
3184 // Restructuring Multiple Prims. 3184 // Restructuring Multiple Prims.
3185 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values); 3185 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values);
@@ -3423,24 +3423,24 @@ namespace OpenSim.Region.ScriptEngine.Common
3423 3423
3424 switch (data) 3424 switch (data)
3425 { 3425 {
3426 case BuiltIn_Commands_BaseClass.DATA_ONLINE: // DATA_ONLINE (0|1) 3426 case ScriptBaseClass.DATA_ONLINE: // DATA_ONLINE (0|1)
3427 if (userProfile.CurrentAgent.AgentOnline) 3427 if (userProfile.CurrentAgent.AgentOnline)
3428 reply = "1"; 3428 reply = "1";
3429 else 3429 else
3430 reply = "0"; 3430 reply = "0";
3431 break; 3431 break;
3432 case BuiltIn_Commands_BaseClass.DATA_NAME: // DATA_NAME (First Last) 3432 case ScriptBaseClass.DATA_NAME: // DATA_NAME (First Last)
3433 reply = userProfile.FirstName + " " + userProfile.SurName; 3433 reply = userProfile.FirstName + " " + userProfile.SurName;
3434 break; 3434 break;
3435 case BuiltIn_Commands_BaseClass.DATA_BORN: // DATA_BORN (YYYY-MM-DD) 3435 case ScriptBaseClass.DATA_BORN: // DATA_BORN (YYYY-MM-DD)
3436 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0); 3436 DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
3437 born = born.AddSeconds(userProfile.Created); 3437 born = born.AddSeconds(userProfile.Created);
3438 reply = born.ToString("yyyy-MM-dd"); 3438 reply = born.ToString("yyyy-MM-dd");
3439 break; 3439 break;
3440 case BuiltIn_Commands_BaseClass.DATA_RATING: // DATA_RATING (0,0,0,0,0,0) 3440 case ScriptBaseClass.DATA_RATING: // DATA_RATING (0,0,0,0,0,0)
3441 reply = "0,0,0,0,0,0"; 3441 reply = "0,0,0,0,0,0";
3442 break; 3442 break;
3443 case BuiltIn_Commands_BaseClass.DATA_PAYINFO: // DATA_PAYINFO (0|1|2|3) 3443 case ScriptBaseClass.DATA_PAYINFO: // DATA_PAYINFO (0|1|2|3)
3444 reply = "0"; 3444 reply = "0";
3445 break; 3445 break;
3446 default: 3446 default:
@@ -3569,7 +3569,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3569 switch ((int)linknum) 3569 switch ((int)linknum)
3570 { 3570 {
3571 3571
3572 case (int)BuiltIn_Commands_BaseClass.LINK_ROOT: 3572 case (int)ScriptBaseClass.LINK_ROOT:
3573 3573
3574 SceneObjectPart part = m_host.ParentGroup.RootPart; 3574 SceneObjectPart part = m_host.ParentGroup.RootPart;
3575 3575
@@ -3593,7 +3593,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3593 3593
3594 break; 3594 break;
3595 3595
3596 case (int)BuiltIn_Commands_BaseClass.LINK_SET: 3596 case (int)ScriptBaseClass.LINK_SET:
3597 3597
3598 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts()) 3598 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts())
3599 { 3599 {
@@ -3618,7 +3618,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3618 3618
3619 break; 3619 break;
3620 3620
3621 case (int)BuiltIn_Commands_BaseClass.LINK_ALL_OTHERS: 3621 case (int)ScriptBaseClass.LINK_ALL_OTHERS:
3622 3622
3623 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts()) 3623 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts())
3624 { 3624 {
@@ -3648,7 +3648,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3648 3648
3649 break; 3649 break;
3650 3650
3651 case (int)BuiltIn_Commands_BaseClass.LINK_ALL_CHILDREN: 3651 case (int)ScriptBaseClass.LINK_ALL_CHILDREN:
3652 3652
3653 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts()) 3653 foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts())
3654 { 3654 {
@@ -3678,7 +3678,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3678 3678
3679 break; 3679 break;
3680 3680
3681 case (int)BuiltIn_Commands_BaseClass.LINK_THIS: 3681 case (int)ScriptBaseClass.LINK_THIS:
3682 3682
3683 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3683 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3684 { 3684 {
@@ -3774,46 +3774,46 @@ namespace OpenSim.Region.ScriptEngine.Common
3774 private int getScriptPrimType(PrimitiveBaseShape primShape) 3774 private int getScriptPrimType(PrimitiveBaseShape primShape)
3775 { 3775 {
3776 if (primShape.SculptEntry) 3776 if (primShape.SculptEntry)
3777 return BuiltIn_Commands_BaseClass.PRIM_TYPE_SCULPT; 3777 return ScriptBaseClass.PRIM_TYPE_SCULPT;
3778 if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) 3778 if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
3779 { 3779 {
3780 if (primShape.PathCurve == (byte)Extrusion.Straight) 3780 if (primShape.PathCurve == (byte)Extrusion.Straight)
3781 return BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX; 3781 return ScriptBaseClass.PRIM_TYPE_BOX;
3782 else if (primShape.PathCurve == (byte)Extrusion.Curve1) 3782 else if (primShape.PathCurve == (byte)Extrusion.Curve1)
3783 return BuiltIn_Commands_BaseClass.PRIM_TYPE_TUBE; 3783 return ScriptBaseClass.PRIM_TYPE_TUBE;
3784 } 3784 }
3785 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle) 3785 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
3786 { 3786 {
3787 if (primShape.PathCurve == (byte)Extrusion.Straight) 3787 if (primShape.PathCurve == (byte)Extrusion.Straight)
3788 return BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER; 3788 return ScriptBaseClass.PRIM_TYPE_CYLINDER;
3789 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits 3789 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
3790 else if (primShape.PathCurve == (byte)Extrusion.Curve1) 3790 else if (primShape.PathCurve == (byte)Extrusion.Curve1)
3791 return BuiltIn_Commands_BaseClass.PRIM_TYPE_TORUS; 3791 return ScriptBaseClass.PRIM_TYPE_TORUS;
3792 } 3792 }
3793 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle) 3793 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
3794 { 3794 {
3795 if (primShape.PathCurve == (byte)Extrusion.Curve1 || primShape.PathCurve == (byte)Extrusion.Curve2) 3795 if (primShape.PathCurve == (byte)Extrusion.Curve1 || primShape.PathCurve == (byte)Extrusion.Curve2)
3796 return BuiltIn_Commands_BaseClass.PRIM_TYPE_SPHERE; 3796 return ScriptBaseClass.PRIM_TYPE_SPHERE;
3797 } 3797 }
3798 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) 3798 else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
3799 { 3799 {
3800 if (primShape.PathCurve == (byte)Extrusion.Straight) 3800 if (primShape.PathCurve == (byte)Extrusion.Straight)
3801 return BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM; 3801 return ScriptBaseClass.PRIM_TYPE_PRISM;
3802 else if (primShape.PathCurve == (byte)Extrusion.Curve1) 3802 else if (primShape.PathCurve == (byte)Extrusion.Curve1)
3803 return BuiltIn_Commands_BaseClass.PRIM_TYPE_RING; 3803 return ScriptBaseClass.PRIM_TYPE_RING;
3804 } 3804 }
3805 return BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX; 3805 return ScriptBaseClass.PRIM_TYPE_BOX;
3806 } 3806 }
3807 3807
3808 // Helper functions to understand if object has cut, hollow, dimple, and other affecting number of faces 3808 // Helper functions to understand if object has cut, hollow, dimple, and other affecting number of faces
3809 private void hasCutHollowDimpleProfileCut(int primType, PrimitiveBaseShape shape, out bool hasCut, out bool hasHollow, 3809 private void hasCutHollowDimpleProfileCut(int primType, PrimitiveBaseShape shape, out bool hasCut, out bool hasHollow,
3810 out bool hasDimple, out bool hasProfileCut) 3810 out bool hasDimple, out bool hasProfileCut)
3811 { 3811 {
3812 if (primType == BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX 3812 if (primType == ScriptBaseClass.PRIM_TYPE_BOX
3813 || 3813 ||
3814 primType == BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER 3814 primType == ScriptBaseClass.PRIM_TYPE_CYLINDER
3815 || 3815 ||
3816 primType == BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM) 3816 primType == ScriptBaseClass.PRIM_TYPE_PRISM)
3817 3817
3818 hasCut = (shape.ProfileBegin > 0) || (shape.ProfileEnd > 0); 3818 hasCut = (shape.ProfileBegin > 0) || (shape.ProfileEnd > 0);
3819 else 3819 else
@@ -3844,46 +3844,46 @@ namespace OpenSim.Region.ScriptEngine.Common
3844 3844
3845 switch (primType) 3845 switch (primType)
3846 { 3846 {
3847 case BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: 3847 case ScriptBaseClass.PRIM_TYPE_BOX:
3848 ret = 6; 3848 ret = 6;
3849 if (hasCut) ret += 2; 3849 if (hasCut) ret += 2;
3850 if (hasHollow) ret += 1; 3850 if (hasHollow) ret += 1;
3851 break; 3851 break;
3852 case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: 3852 case ScriptBaseClass.PRIM_TYPE_CYLINDER:
3853 ret = 3; 3853 ret = 3;
3854 if (hasCut) ret += 2; 3854 if (hasCut) ret += 2;
3855 if (hasHollow) ret += 1; 3855 if (hasHollow) ret += 1;
3856 break; 3856 break;
3857 case BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM: 3857 case ScriptBaseClass.PRIM_TYPE_PRISM:
3858 ret = 5; 3858 ret = 5;
3859 if (hasCut) ret += 2; 3859 if (hasCut) ret += 2;
3860 if (hasHollow) ret += 1; 3860 if (hasHollow) ret += 1;
3861 break; 3861 break;
3862 case BuiltIn_Commands_BaseClass.PRIM_TYPE_SPHERE: 3862 case ScriptBaseClass.PRIM_TYPE_SPHERE:
3863 ret = 1; 3863 ret = 1;
3864 if (hasCut) ret += 2; 3864 if (hasCut) ret += 2;
3865 if (hasDimple) ret += 2; 3865 if (hasDimple) ret += 2;
3866 if (hasHollow) ret += 3; // Emulate lsl on secondlife (according to documentation it should have added only +1) 3866 if (hasHollow) ret += 3; // Emulate lsl on secondlife (according to documentation it should have added only +1)
3867 break; 3867 break;
3868 case BuiltIn_Commands_BaseClass.PRIM_TYPE_TORUS: 3868 case ScriptBaseClass.PRIM_TYPE_TORUS:
3869 ret = 1; 3869 ret = 1;
3870 if (hasCut) ret += 2; 3870 if (hasCut) ret += 2;
3871 if (hasProfileCut) ret += 2; 3871 if (hasProfileCut) ret += 2;
3872 if (hasHollow) ret += 1; 3872 if (hasHollow) ret += 1;
3873 break; 3873 break;
3874 case BuiltIn_Commands_BaseClass.PRIM_TYPE_TUBE: 3874 case ScriptBaseClass.PRIM_TYPE_TUBE:
3875 ret = 4; 3875 ret = 4;
3876 if (hasCut) ret += 2; 3876 if (hasCut) ret += 2;
3877 if (hasProfileCut) ret += 2; 3877 if (hasProfileCut) ret += 2;
3878 if (hasHollow) ret += 1; 3878 if (hasHollow) ret += 1;
3879 break; 3879 break;
3880 case BuiltIn_Commands_BaseClass.PRIM_TYPE_RING: 3880 case ScriptBaseClass.PRIM_TYPE_RING:
3881 ret = 3; 3881 ret = 3;
3882 if (hasCut) ret += 2; 3882 if (hasCut) ret += 2;
3883 if (hasProfileCut) ret += 2; 3883 if (hasProfileCut) ret += 2;
3884 if (hasHollow) ret += 1; 3884 if (hasHollow) ret += 1;
3885 break; 3885 break;
3886 case BuiltIn_Commands_BaseClass.PRIM_TYPE_SCULPT: 3886 case ScriptBaseClass.PRIM_TYPE_SCULPT:
3887 ret = 1; 3887 ret = 1;
3888 break; 3888 break;
3889 } 3889 }
@@ -4074,7 +4074,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4074 { 4074 {
4075 Primitive.TextureEntry tex = part.Shape.Textures; 4075 Primitive.TextureEntry tex = part.Shape.Textures;
4076 LSL_Vector offset = new LSL_Vector(); 4076 LSL_Vector offset = new LSL_Vector();
4077 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 4077 if (face == ScriptBaseClass.ALL_SIDES)
4078 { 4078 {
4079 face = 0; 4079 face = 0;
4080 } 4080 }
@@ -4944,7 +4944,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4944 LSL_Vector agentSize; 4944 LSL_Vector agentSize;
4945 if (avatar == null) 4945 if (avatar == null)
4946 { 4946 {
4947 agentSize = BuiltIn_Commands_BaseClass.ZERO_VECTOR; 4947 agentSize = ScriptBaseClass.ZERO_VECTOR;
4948 } 4948 }
4949 else 4949 else
4950 { 4950 {
@@ -5175,23 +5175,23 @@ namespace OpenSim.Region.ScriptEngine.Common
5175 { 5175 {
5176 switch ((int)rules.Data[i]) 5176 switch ((int)rules.Data[i])
5177 { 5177 {
5178 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_FLAGS: 5178 case (int)ScriptBaseClass.PSYS_PART_FLAGS:
5179 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)((uint)Convert.ToInt32(rules.Data[i + 1].ToString())); 5179 prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)((uint)Convert.ToInt32(rules.Data[i + 1].ToString()));
5180 break; 5180 break;
5181 5181
5182 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_START_COLOR: 5182 case (int)ScriptBaseClass.PSYS_PART_START_COLOR:
5183 tempv = (LSL_Vector)rules.Data[i + 1]; 5183 tempv = (LSL_Vector)rules.Data[i + 1];
5184 prules.PartStartColor.R = (float)tempv.x; 5184 prules.PartStartColor.R = (float)tempv.x;
5185 prules.PartStartColor.G = (float)tempv.y; 5185 prules.PartStartColor.G = (float)tempv.y;
5186 prules.PartStartColor.B = (float)tempv.z; 5186 prules.PartStartColor.B = (float)tempv.z;
5187 break; 5187 break;
5188 5188
5189 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_START_ALPHA: 5189 case (int)ScriptBaseClass.PSYS_PART_START_ALPHA:
5190 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5190 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5191 prules.PartStartColor.A = (float)tempf; 5191 prules.PartStartColor.A = (float)tempf;
5192 break; 5192 break;
5193 5193
5194 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_END_COLOR: 5194 case (int)ScriptBaseClass.PSYS_PART_END_COLOR:
5195 tempv = (LSL_Vector)rules.Data[i + 1]; 5195 tempv = (LSL_Vector)rules.Data[i + 1];
5196 //prules.PartEndColor = new Color4(tempv.x,tempv.y,tempv.z,1); 5196 //prules.PartEndColor = new Color4(tempv.x,tempv.y,tempv.z,1);
5197 5197
@@ -5200,36 +5200,36 @@ namespace OpenSim.Region.ScriptEngine.Common
5200 prules.PartEndColor.B = (float)tempv.z; 5200 prules.PartEndColor.B = (float)tempv.z;
5201 break; 5201 break;
5202 5202
5203 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_END_ALPHA: 5203 case (int)ScriptBaseClass.PSYS_PART_END_ALPHA:
5204 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5204 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5205 prules.PartEndColor.A = (float)tempf; 5205 prules.PartEndColor.A = (float)tempf;
5206 break; 5206 break;
5207 5207
5208 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_START_SCALE: 5208 case (int)ScriptBaseClass.PSYS_PART_START_SCALE:
5209 tempv = (LSL_Vector)rules.Data[i + 1]; 5209 tempv = (LSL_Vector)rules.Data[i + 1];
5210 prules.PartStartScaleX = (float)tempv.x; 5210 prules.PartStartScaleX = (float)tempv.x;
5211 prules.PartStartScaleY = (float)tempv.y; 5211 prules.PartStartScaleY = (float)tempv.y;
5212 break; 5212 break;
5213 5213
5214 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_END_SCALE: 5214 case (int)ScriptBaseClass.PSYS_PART_END_SCALE:
5215 tempv = (LSL_Vector)rules.Data[i + 1]; 5215 tempv = (LSL_Vector)rules.Data[i + 1];
5216 prules.PartEndScaleX = (float)tempv.x; 5216 prules.PartEndScaleX = (float)tempv.x;
5217 prules.PartEndScaleY = (float)tempv.y; 5217 prules.PartEndScaleY = (float)tempv.y;
5218 break; 5218 break;
5219 5219
5220 case (int)BuiltIn_Commands_BaseClass.PSYS_PART_MAX_AGE: 5220 case (int)ScriptBaseClass.PSYS_PART_MAX_AGE:
5221 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5221 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5222 prules.PartMaxAge = (float)tempf; 5222 prules.PartMaxAge = (float)tempf;
5223 break; 5223 break;
5224 5224
5225 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_ACCEL: 5225 case (int)ScriptBaseClass.PSYS_SRC_ACCEL:
5226 tempv = (LSL_Vector)rules.Data[i + 1]; 5226 tempv = (LSL_Vector)rules.Data[i + 1];
5227 prules.PartAcceleration.X = (float)tempv.x; 5227 prules.PartAcceleration.X = (float)tempv.x;
5228 prules.PartAcceleration.Y = (float)tempv.y; 5228 prules.PartAcceleration.Y = (float)tempv.y;
5229 prules.PartAcceleration.Z = (float)tempv.z; 5229 prules.PartAcceleration.Z = (float)tempv.z;
5230 break; 5230 break;
5231 5231
5232 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_PATTERN: 5232 case (int)ScriptBaseClass.PSYS_SRC_PATTERN:
5233 int tmpi = int.Parse(rules.Data[i + 1].ToString()); 5233 int tmpi = int.Parse(rules.Data[i + 1].ToString());
5234 prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi; 5234 prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
5235 break; 5235 break;
@@ -5238,40 +5238,40 @@ namespace OpenSim.Region.ScriptEngine.Common
5238 // Wiki: PSYS_SRC_TEXTURE string inventory item name or key of the particle texture 5238 // Wiki: PSYS_SRC_TEXTURE string inventory item name or key of the particle texture
5239 // "" = default texture. 5239 // "" = default texture.
5240 // 20080530 Updated to remove code duplication 5240 // 20080530 Updated to remove code duplication
5241 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_TEXTURE: 5241 case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
5242 prules.Texture = KeyOrName(rules.Data[i + 1].ToString()); 5242 prules.Texture = KeyOrName(rules.Data[i + 1].ToString());
5243 break; 5243 break;
5244 5244
5245 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_RATE: 5245 case (int)ScriptBaseClass.PSYS_SRC_BURST_RATE:
5246 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5246 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5247 prules.BurstRate = (float)tempf; 5247 prules.BurstRate = (float)tempf;
5248 break; 5248 break;
5249 5249
5250 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_PART_COUNT: 5250 case (int)ScriptBaseClass.PSYS_SRC_BURST_PART_COUNT:
5251 prules.BurstPartCount = (byte)Convert.ToByte(rules.Data[i + 1].ToString()); 5251 prules.BurstPartCount = (byte)Convert.ToByte(rules.Data[i + 1].ToString());
5252 break; 5252 break;
5253 5253
5254 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_RADIUS: 5254 case (int)ScriptBaseClass.PSYS_SRC_BURST_RADIUS:
5255 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5255 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5256 prules.BurstRadius = (float)tempf; 5256 prules.BurstRadius = (float)tempf;
5257 break; 5257 break;
5258 5258
5259 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_SPEED_MIN: 5259 case (int)ScriptBaseClass.PSYS_SRC_BURST_SPEED_MIN:
5260 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5260 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5261 prules.BurstSpeedMin = (float)tempf; 5261 prules.BurstSpeedMin = (float)tempf;
5262 break; 5262 break;
5263 5263
5264 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_BURST_SPEED_MAX: 5264 case (int)ScriptBaseClass.PSYS_SRC_BURST_SPEED_MAX:
5265 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5265 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5266 prules.BurstSpeedMax = (float)tempf; 5266 prules.BurstSpeedMax = (float)tempf;
5267 break; 5267 break;
5268 5268
5269 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_MAX_AGE: 5269 case (int)ScriptBaseClass.PSYS_SRC_MAX_AGE:
5270 tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); 5270 tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
5271 prules.MaxAge = (float)tempf; 5271 prules.MaxAge = (float)tempf;
5272 break; 5272 break;
5273 5273
5274 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_TARGET_KEY: 5274 case (int)ScriptBaseClass.PSYS_SRC_TARGET_KEY:
5275 UUID key = UUID.Zero; 5275 UUID key = UUID.Zero;
5276 if (UUID.TryParse(rules.Data[i + 1].ToString(), out key)) 5276 if (UUID.TryParse(rules.Data[i + 1].ToString(), out key))
5277 { 5277 {
@@ -5283,7 +5283,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5283 } 5283 }
5284 break; 5284 break;
5285 5285
5286 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_OMEGA: 5286 case (int)ScriptBaseClass.PSYS_SRC_OMEGA:
5287 // AL: This is an assumption, since it is the only thing that would match. 5287 // AL: This is an assumption, since it is the only thing that would match.
5288 tempv = rules.GetVector3Item(i + 1); 5288 tempv = rules.GetVector3Item(i + 1);
5289 prules.AngularVelocity.X = (float)tempv.x; 5289 prules.AngularVelocity.X = (float)tempv.x;
@@ -5291,12 +5291,12 @@ namespace OpenSim.Region.ScriptEngine.Common
5291 prules.AngularVelocity.Z = (float)tempv.z; 5291 prules.AngularVelocity.Z = (float)tempv.z;
5292 break; 5292 break;
5293 5293
5294 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_ANGLE_BEGIN: 5294 case (int)ScriptBaseClass.PSYS_SRC_ANGLE_BEGIN:
5295 tempf = (float)rules.GetLSLFloatItem(i + 1); 5295 tempf = (float)rules.GetLSLFloatItem(i + 1);
5296 prules.InnerAngle = (float)tempf; 5296 prules.InnerAngle = (float)tempf;
5297 break; 5297 break;
5298 5298
5299 case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_ANGLE_END: 5299 case (int)ScriptBaseClass.PSYS_SRC_ANGLE_END:
5300 tempf = (float)rules.GetLSLFloatItem(i + 1); 5300 tempf = (float)rules.GetLSLFloatItem(i + 1);
5301 prules.OuterAngle = (float)tempf; 5301 prules.OuterAngle = (float)tempf;
5302 break; 5302 break;
@@ -5700,12 +5700,12 @@ namespace OpenSim.Region.ScriptEngine.Common
5700 { 5700 {
5701 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 5701 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
5702 5702
5703 if (holeshape != (int)BuiltIn_Commands_BaseClass.PRIM_HOLE_DEFAULT && 5703 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
5704 holeshape != (int)BuiltIn_Commands_BaseClass.PRIM_HOLE_CIRCLE && 5704 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
5705 holeshape != (int)BuiltIn_Commands_BaseClass.PRIM_HOLE_SQUARE && 5705 holeshape != (int)ScriptBaseClass.PRIM_HOLE_SQUARE &&
5706 holeshape != (int)BuiltIn_Commands_BaseClass.PRIM_HOLE_TRIANGLE) 5706 holeshape != (int)ScriptBaseClass.PRIM_HOLE_TRIANGLE)
5707 { 5707 {
5708 holeshape = (int)BuiltIn_Commands_BaseClass.PRIM_HOLE_DEFAULT; 5708 holeshape = (int)ScriptBaseClass.PRIM_HOLE_DEFAULT;
5709 } 5709 }
5710 shapeBlock.ProfileCurve = (byte)holeshape; 5710 shapeBlock.ProfileCurve = (byte)holeshape;
5711 if (cut.x < 0f) 5711 if (cut.x < 0f)
@@ -5990,13 +5990,13 @@ namespace OpenSim.Region.ScriptEngine.Common
5990 shapeBlock.PathScaleX = 100; 5990 shapeBlock.PathScaleX = 100;
5991 shapeBlock.PathScaleY = 150; 5991 shapeBlock.PathScaleY = 150;
5992 5992
5993 if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER && 5993 if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER &&
5994 type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE && 5994 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE &&
5995 type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE && 5995 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE &&
5996 type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS) 5996 type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS)
5997 { 5997 {
5998 // default 5998 // default
5999 type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE; 5999 type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
6000 } 6000 }
6001 6001
6002 // retain pathcurve 6002 // retain pathcurve
@@ -6037,7 +6037,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6037 6037
6038 switch (code) 6038 switch (code)
6039 { 6039 {
6040 case (int)BuiltIn_Commands_BaseClass.PRIM_POSITION: 6040 case (int)ScriptBaseClass.PRIM_POSITION:
6041 if (remain < 1) 6041 if (remain < 1)
6042 return; 6042 return;
6043 6043
@@ -6045,7 +6045,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6045 SetPos(part, v); 6045 SetPos(part, v);
6046 6046
6047 break; 6047 break;
6048 case (int)BuiltIn_Commands_BaseClass.PRIM_SIZE: 6048 case (int)ScriptBaseClass.PRIM_SIZE:
6049 if (remain < 1) 6049 if (remain < 1)
6050 return; 6050 return;
6051 6051
@@ -6053,7 +6053,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6053 SetScale(part, v); 6053 SetScale(part, v);
6054 6054
6055 break; 6055 break;
6056 case (int)BuiltIn_Commands_BaseClass.PRIM_ROTATION: 6056 case (int)ScriptBaseClass.PRIM_ROTATION:
6057 if (remain < 1) 6057 if (remain < 1)
6058 return; 6058 return;
6059 6059
@@ -6062,7 +6062,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6062 6062
6063 break; 6063 break;
6064 6064
6065 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: 6065 case (int)ScriptBaseClass.PRIM_TYPE:
6066 if (remain < 3) 6066 if (remain < 3)
6067 return; 6067 return;
6068 6068
@@ -6081,7 +6081,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6081 6081
6082 switch (code) 6082 switch (code)
6083 { 6083 {
6084 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: 6084 case (int)ScriptBaseClass.PRIM_TYPE_BOX:
6085 if (remain < 6) 6085 if (remain < 6)
6086 return; 6086 return;
6087 6087
@@ -6095,7 +6095,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6095 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 1); 6095 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 1);
6096 break; 6096 break;
6097 6097
6098 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: 6098 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
6099 if (remain < 6) 6099 if (remain < 6)
6100 return; 6100 return;
6101 6101
@@ -6110,7 +6110,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6110 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 0); 6110 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 0);
6111 break; 6111 break;
6112 6112
6113 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM: 6113 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
6114 if (remain < 6) 6114 if (remain < 6)
6115 return; 6115 return;
6116 6116
@@ -6124,7 +6124,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6124 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 3); 6124 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, topshear, 3);
6125 break; 6125 break;
6126 6126
6127 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_SPHERE: 6127 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
6128 if (remain < 5) 6128 if (remain < 5)
6129 return; 6129 return;
6130 6130
@@ -6137,7 +6137,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6137 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, 5); 6137 SetPrimitiveShapeParams(part, face, v, hollow, twist, taper_b, 5);
6138 break; 6138 break;
6139 6139
6140 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_TORUS: 6140 case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
6141 if (remain < 11) 6141 if (remain < 11)
6142 return; 6142 return;
6143 6143
@@ -6156,7 +6156,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6156 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 0); 6156 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 0);
6157 break; 6157 break;
6158 6158
6159 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_TUBE: 6159 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
6160 if (remain < 11) 6160 if (remain < 11)
6161 return; 6161 return;
6162 6162
@@ -6175,7 +6175,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6175 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 1); 6175 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 1);
6176 break; 6176 break;
6177 6177
6178 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_RING: 6178 case (int)ScriptBaseClass.PRIM_TYPE_RING:
6179 if (remain < 11) 6179 if (remain < 11)
6180 return; 6180 return;
6181 6181
@@ -6194,7 +6194,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6194 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 3); 6194 SetPrimitiveShapeParams(part, face, v, hollow, twist, holesize, topshear, profilecut, taper_b, revolutions, radiusoffset, skew, 3);
6195 break; 6195 break;
6196 6196
6197 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_SCULPT: 6197 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
6198 if (remain < 2) 6198 if (remain < 2)
6199 return; 6199 return;
6200 6200
@@ -6207,7 +6207,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6207 6207
6208 break; 6208 break;
6209 6209
6210 case (int)BuiltIn_Commands_BaseClass.PRIM_TEXTURE: 6210 case (int)ScriptBaseClass.PRIM_TEXTURE:
6211 if (remain < 5) 6211 if (remain < 5)
6212 return; 6212 return;
6213 6213
@@ -6224,7 +6224,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6224 6224
6225 break; 6225 break;
6226 6226
6227 case (int)BuiltIn_Commands_BaseClass.PRIM_COLOR: 6227 case (int)ScriptBaseClass.PRIM_COLOR:
6228 if (remain < 3) 6228 if (remain < 3)
6229 return; 6229 return;
6230 6230
@@ -6236,7 +6236,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6236 SetAlpha(part, alpha, face); 6236 SetAlpha(part, alpha, face);
6237 6237
6238 break; 6238 break;
6239 case (int)BuiltIn_Commands_BaseClass.PRIM_FLEXIBLE: 6239 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
6240 if (remain < 7) 6240 if (remain < 7)
6241 return; 6241 return;
6242 6242
@@ -6251,7 +6251,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6251 SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force); 6251 SetFlexi(part, flexi, softness, gravity, friction, wind, tension, force);
6252 6252
6253 break; 6253 break;
6254 case (int)BuiltIn_Commands_BaseClass.PRIM_POINT_LIGHT: 6254 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
6255 if (remain < 5) 6255 if (remain < 5)
6256 return; 6256 return;
6257 bool light = rules.GetLSLIntegerItem(idx++); 6257 bool light = rules.GetLSLIntegerItem(idx++);
@@ -6263,7 +6263,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6263 SetPointLight(part, light, lightcolor, intensity, radius, falloff); 6263 SetPointLight(part, light, lightcolor, intensity, radius, falloff);
6264 6264
6265 break; 6265 break;
6266 case (int)BuiltIn_Commands_BaseClass.PRIM_GLOW: 6266 case (int)ScriptBaseClass.PRIM_GLOW:
6267 if (remain < 2) 6267 if (remain < 2)
6268 return; 6268 return;
6269 face = rules.GetLSLIntegerItem(idx++); 6269 face = rules.GetLSLIntegerItem(idx++);
@@ -6272,7 +6272,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6272 SetGlow(part, face, glow); 6272 SetGlow(part, face, glow);
6273 6273
6274 break; 6274 break;
6275 case (int)BuiltIn_Commands_BaseClass.PRIM_BUMP_SHINY: 6275 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
6276 if (remain < 3) 6276 if (remain < 3)
6277 return; 6277 return;
6278 face = (int)rules.GetLSLIntegerItem(idx++); 6278 face = (int)rules.GetLSLIntegerItem(idx++);
@@ -6282,14 +6282,14 @@ namespace OpenSim.Region.ScriptEngine.Common
6282 SetShiny(part, face, shiny, bump); 6282 SetShiny(part, face, shiny, bump);
6283 6283
6284 break; 6284 break;
6285 case (int)BuiltIn_Commands_BaseClass.PRIM_FULLBRIGHT: 6285 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
6286 if (remain < 2) 6286 if (remain < 2)
6287 return; 6287 return;
6288 face = rules.GetLSLIntegerItem(idx++); 6288 face = rules.GetLSLIntegerItem(idx++);
6289 bool st = rules.GetLSLIntegerItem(idx++); 6289 bool st = rules.GetLSLIntegerItem(idx++);
6290 SetFullBright(part, face , st); 6290 SetFullBright(part, face , st);
6291 break; 6291 break;
6292 case (int)BuiltIn_Commands_BaseClass.PRIM_MATERIAL: 6292 case (int)ScriptBaseClass.PRIM_MATERIAL:
6293 if (remain < 1) 6293 if (remain < 1)
6294 return; 6294 return;
6295 if (part != null) 6295 if (part != null)
@@ -6302,7 +6302,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6302 return; 6302 return;
6303 } 6303 }
6304 break; 6304 break;
6305 case (int)BuiltIn_Commands_BaseClass.PRIM_PHANTOM: 6305 case (int)ScriptBaseClass.PRIM_PHANTOM:
6306 if (remain < 1) 6306 if (remain < 1)
6307 return; 6307 return;
6308 6308
@@ -6317,7 +6317,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6317 part.ScriptSetPhantomStatus(phantom); 6317 part.ScriptSetPhantomStatus(phantom);
6318 part.ScheduleFullUpdate(); 6318 part.ScheduleFullUpdate();
6319 break; 6319 break;
6320 case (int)BuiltIn_Commands_BaseClass.PRIM_PHYSICS: 6320 case (int)ScriptBaseClass.PRIM_PHYSICS:
6321 if (remain < 1) 6321 if (remain < 1)
6322 return; 6322 return;
6323 string phy = rules.Data[idx++].ToString(); 6323 string phy = rules.Data[idx++].ToString();
@@ -6478,7 +6478,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6478 part.UpdateTexture(tex); 6478 part.UpdateTexture(tex);
6479 return; 6479 return;
6480 } 6480 }
6481 else if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 6481 else if (face == ScriptBaseClass.ALL_SIDES)
6482 { 6482 {
6483 texcolor = tex.DefaultTexture.RGBA; 6483 texcolor = tex.DefaultTexture.RGBA;
6484 texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f); 6484 texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f);
@@ -6571,60 +6571,60 @@ namespace OpenSim.Region.ScriptEngine.Common
6571 6571
6572 switch (code) 6572 switch (code)
6573 { 6573 {
6574 case (int)BuiltIn_Commands_BaseClass.PRIM_MATERIAL: 6574 case (int)ScriptBaseClass.PRIM_MATERIAL:
6575 res.Add(new LSL_Integer(m_host.Material)); 6575 res.Add(new LSL_Integer(m_host.Material));
6576 break; 6576 break;
6577 6577
6578 case (int)BuiltIn_Commands_BaseClass.PRIM_PHYSICS: 6578 case (int)ScriptBaseClass.PRIM_PHYSICS:
6579 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) != 0) 6579 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Physics) != 0)
6580 res.Add(new LSL_Integer(1)); 6580 res.Add(new LSL_Integer(1));
6581 else 6581 else
6582 res.Add(new LSL_Integer(0)); 6582 res.Add(new LSL_Integer(0));
6583 break; 6583 break;
6584 6584
6585 case (int)BuiltIn_Commands_BaseClass.PRIM_TEMP_ON_REZ: 6585 case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
6586 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) != 0) 6586 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) != 0)
6587 res.Add(new LSL_Integer(1)); 6587 res.Add(new LSL_Integer(1));
6588 else 6588 else
6589 res.Add(new LSL_Integer(0)); 6589 res.Add(new LSL_Integer(0));
6590 break; 6590 break;
6591 6591
6592 case (int)BuiltIn_Commands_BaseClass.PRIM_PHANTOM: 6592 case (int)ScriptBaseClass.PRIM_PHANTOM:
6593 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0) 6593 if ((m_host.GetEffectiveObjectFlags() & (uint)PrimFlags.Phantom) != 0)
6594 res.Add(new LSL_Integer(1)); 6594 res.Add(new LSL_Integer(1));
6595 else 6595 else
6596 res.Add(new LSL_Integer(0)); 6596 res.Add(new LSL_Integer(0));
6597 break; 6597 break;
6598 6598
6599 case (int)BuiltIn_Commands_BaseClass.PRIM_POSITION: 6599 case (int)ScriptBaseClass.PRIM_POSITION:
6600 res.Add(new LSL_Vector(m_host.AbsolutePosition.X, 6600 res.Add(new LSL_Vector(m_host.AbsolutePosition.X,
6601 m_host.AbsolutePosition.Y, 6601 m_host.AbsolutePosition.Y,
6602 m_host.AbsolutePosition.Z)); 6602 m_host.AbsolutePosition.Z));
6603 break; 6603 break;
6604 6604
6605 case (int)BuiltIn_Commands_BaseClass.PRIM_SIZE: 6605 case (int)ScriptBaseClass.PRIM_SIZE:
6606 res.Add(new LSL_Vector(m_host.Scale.X, 6606 res.Add(new LSL_Vector(m_host.Scale.X,
6607 m_host.Scale.Y, 6607 m_host.Scale.Y,
6608 m_host.Scale.Z)); 6608 m_host.Scale.Z));
6609 break; 6609 break;
6610 6610
6611 case (int)BuiltIn_Commands_BaseClass.PRIM_ROTATION: 6611 case (int)ScriptBaseClass.PRIM_ROTATION:
6612 res.Add(new LSL_Rotation(m_host.RotationOffset.X, 6612 res.Add(new LSL_Rotation(m_host.RotationOffset.X,
6613 m_host.RotationOffset.Y, 6613 m_host.RotationOffset.Y,
6614 m_host.RotationOffset.Z, 6614 m_host.RotationOffset.Z,
6615 m_host.RotationOffset.W)); 6615 m_host.RotationOffset.W));
6616 break; 6616 break;
6617 6617
6618 case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: 6618 case (int)ScriptBaseClass.PRIM_TYPE:
6619 // implementing box 6619 // implementing box
6620 PrimitiveBaseShape Shape = m_host.Shape; 6620 PrimitiveBaseShape Shape = m_host.Shape;
6621 int primType = getScriptPrimType(m_host.Shape); 6621 int primType = getScriptPrimType(m_host.Shape);
6622 res.Add(new LSL_Integer(primType)); 6622 res.Add(new LSL_Integer(primType));
6623 switch (primType) 6623 switch (primType)
6624 { 6624 {
6625 case BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: 6625 case ScriptBaseClass.PRIM_TYPE_BOX:
6626 case BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: 6626 case ScriptBaseClass.PRIM_TYPE_CYLINDER:
6627 case BuiltIn_Commands_BaseClass.PRIM_TYPE_PRISM: 6627 case ScriptBaseClass.PRIM_TYPE_PRISM:
6628 res.Add(new LSL_Integer(Shape.ProfileCurve)); 6628 res.Add(new LSL_Integer(Shape.ProfileCurve));
6629 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); 6629 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
6630 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0)); 6630 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
@@ -6633,7 +6633,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6633 res.Add(new LSL_Vector(Shape.PathShearX / 100.0, Shape.PathShearY / 100.0, 0)); 6633 res.Add(new LSL_Vector(Shape.PathShearX / 100.0, Shape.PathShearY / 100.0, 0));
6634 break; 6634 break;
6635 6635
6636 case BuiltIn_Commands_BaseClass.PRIM_TYPE_SPHERE: 6636 case ScriptBaseClass.PRIM_TYPE_SPHERE:
6637 res.Add(new LSL_Integer(Shape.ProfileCurve)); 6637 res.Add(new LSL_Integer(Shape.ProfileCurve));
6638 res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0)); 6638 res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
6639 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0)); 6639 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
@@ -6641,14 +6641,14 @@ namespace OpenSim.Region.ScriptEngine.Common
6641 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0)); 6641 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
6642 break; 6642 break;
6643 6643
6644 case BuiltIn_Commands_BaseClass.PRIM_TYPE_SCULPT: 6644 case ScriptBaseClass.PRIM_TYPE_SCULPT:
6645 res.Add(Shape.SculptTexture.ToString()); 6645 res.Add(Shape.SculptTexture.ToString());
6646 res.Add(new LSL_Integer(Shape.SculptType)); 6646 res.Add(new LSL_Integer(Shape.SculptType));
6647 break; 6647 break;
6648 6648
6649 case BuiltIn_Commands_BaseClass.PRIM_TYPE_RING: 6649 case ScriptBaseClass.PRIM_TYPE_RING:
6650 case BuiltIn_Commands_BaseClass.PRIM_TYPE_TUBE: 6650 case ScriptBaseClass.PRIM_TYPE_TUBE:
6651 case BuiltIn_Commands_BaseClass.PRIM_TYPE_TORUS: 6651 case ScriptBaseClass.PRIM_TYPE_TORUS:
6652 // holeshape 6652 // holeshape
6653 res.Add(new LSL_Integer(Shape.ProfileCurve)); 6653 res.Add(new LSL_Integer(Shape.ProfileCurve));
6654 6654
@@ -6687,13 +6687,13 @@ namespace OpenSim.Region.ScriptEngine.Common
6687 } 6687 }
6688 break; 6688 break;
6689 6689
6690 case (int)BuiltIn_Commands_BaseClass.PRIM_TEXTURE: 6690 case (int)ScriptBaseClass.PRIM_TEXTURE:
6691 if (remain < 1) 6691 if (remain < 1)
6692 return res; 6692 return res;
6693 6693
6694 int face = (int)rules.GetLSLIntegerItem(idx++); 6694 int face = (int)rules.GetLSLIntegerItem(idx++);
6695 Primitive.TextureEntry tex = m_host.Shape.Textures; 6695 Primitive.TextureEntry tex = m_host.Shape.Textures;
6696 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 6696 if (face == ScriptBaseClass.ALL_SIDES)
6697 { 6697 {
6698 for (face = 0 ; face < GetNumberOfSides(m_host) ; face++) 6698 for (face = 0 ; face < GetNumberOfSides(m_host) ; face++)
6699 { 6699 {
@@ -6727,7 +6727,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6727 } 6727 }
6728 break; 6728 break;
6729 6729
6730 case (int)BuiltIn_Commands_BaseClass.PRIM_COLOR: 6730 case (int)ScriptBaseClass.PRIM_COLOR:
6731 if (remain < 1) 6731 if (remain < 1)
6732 return res; 6732 return res;
6733 6733
@@ -6735,7 +6735,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6735 6735
6736 tex = m_host.Shape.Textures; 6736 tex = m_host.Shape.Textures;
6737 Color4 texcolor; 6737 Color4 texcolor;
6738 if (face == BuiltIn_Commands_BaseClass.ALL_SIDES) 6738 if (face == ScriptBaseClass.ALL_SIDES)
6739 { 6739 {
6740 for (face = 0 ; face < GetNumberOfSides(m_host) ; face++) 6740 for (face = 0 ; face < GetNumberOfSides(m_host) ; face++)
6741 { 6741 {
@@ -6756,7 +6756,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6756 } 6756 }
6757 break; 6757 break;
6758 6758
6759 case (int)BuiltIn_Commands_BaseClass.PRIM_BUMP_SHINY: 6759 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
6760 // TODO-------------- 6760 // TODO--------------
6761 if (remain < 1) 6761 if (remain < 1)
6762 return res; 6762 return res;
@@ -6767,7 +6767,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6767 res.Add(new LSL_Integer(0)); 6767 res.Add(new LSL_Integer(0));
6768 break; 6768 break;
6769 6769
6770 case (int)BuiltIn_Commands_BaseClass.PRIM_FULLBRIGHT: 6770 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
6771 // TODO-------------- 6771 // TODO--------------
6772 if (remain < 1) 6772 if (remain < 1)
6773 return res; 6773 return res;
@@ -6777,7 +6777,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6777 res.Add(new LSL_Integer(0)); 6777 res.Add(new LSL_Integer(0));
6778 break; 6778 break;
6779 6779
6780 case (int)BuiltIn_Commands_BaseClass.PRIM_FLEXIBLE: 6780 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
6781 PrimitiveBaseShape shape = m_host.Shape; 6781 PrimitiveBaseShape shape = m_host.Shape;
6782 6782
6783 if (shape.FlexiEntry) 6783 if (shape.FlexiEntry)
@@ -6794,7 +6794,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6794 shape.FlexiForceZ)); 6794 shape.FlexiForceZ));
6795 break; 6795 break;
6796 6796
6797 case (int)BuiltIn_Commands_BaseClass.PRIM_TEXGEN: 6797 case (int)ScriptBaseClass.PRIM_TEXGEN:
6798 // TODO-------------- 6798 // TODO--------------
6799 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) 6799 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
6800 if (remain < 1) 6800 if (remain < 1)
@@ -6805,7 +6805,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6805 res.Add(new LSL_Integer(0)); 6805 res.Add(new LSL_Integer(0));
6806 break; 6806 break;
6807 6807
6808 case (int)BuiltIn_Commands_BaseClass.PRIM_POINT_LIGHT: 6808 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
6809 shape = m_host.Shape; 6809 shape = m_host.Shape;
6810 6810
6811 if (shape.LightEntry) 6811 if (shape.LightEntry)
@@ -6820,7 +6820,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6820 res.Add(new LSL_Float(shape.LightFalloff)); // falloff 6820 res.Add(new LSL_Float(shape.LightFalloff)); // falloff
6821 break; 6821 break;
6822 6822
6823 case (int)BuiltIn_Commands_BaseClass.PRIM_GLOW: 6823 case (int)ScriptBaseClass.PRIM_GLOW:
6824 // TODO-------------- 6824 // TODO--------------
6825 if (remain < 1) 6825 if (remain < 1)
6826 return res; 6826 return res;
@@ -7285,27 +7285,27 @@ namespace OpenSim.Region.ScriptEngine.Common
7285 7285
7286 int permmask = 0; 7286 int permmask = 0;
7287 7287
7288 if (mask == BuiltIn_Commands_BaseClass.MASK_BASE)//0 7288 if (mask == ScriptBaseClass.MASK_BASE)//0
7289 { 7289 {
7290 permmask = (int)m_host.BaseMask; 7290 permmask = (int)m_host.BaseMask;
7291 } 7291 }
7292 7292
7293 else if (mask == BuiltIn_Commands_BaseClass.MASK_OWNER)//1 7293 else if (mask == ScriptBaseClass.MASK_OWNER)//1
7294 { 7294 {
7295 permmask = (int)m_host.OwnerMask; 7295 permmask = (int)m_host.OwnerMask;
7296 } 7296 }
7297 7297
7298 else if (mask == BuiltIn_Commands_BaseClass.MASK_GROUP)//2 7298 else if (mask == ScriptBaseClass.MASK_GROUP)//2
7299 { 7299 {
7300 permmask = (int)m_host.GroupMask; 7300 permmask = (int)m_host.GroupMask;
7301 } 7301 }
7302 7302
7303 else if (mask == BuiltIn_Commands_BaseClass.MASK_EVERYONE)//3 7303 else if (mask == ScriptBaseClass.MASK_EVERYONE)//3
7304 { 7304 {
7305 permmask = (int)m_host.EveryoneMask; 7305 permmask = (int)m_host.EveryoneMask;
7306 } 7306 }
7307 7307
7308 else if (mask == BuiltIn_Commands_BaseClass.MASK_NEXT)//4 7308 else if (mask == ScriptBaseClass.MASK_NEXT)//4
7309 { 7309 {
7310 permmask = (int)m_host.NextOwnerMask; 7310 permmask = (int)m_host.NextOwnerMask;
7311 } 7311 }
@@ -7324,27 +7324,27 @@ namespace OpenSim.Region.ScriptEngine.Common
7324 { 7324 {
7325 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) 7325 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID))
7326 { 7326 {
7327 if (mask == BuiltIn_Commands_BaseClass.MASK_BASE)//0 7327 if (mask == ScriptBaseClass.MASK_BASE)//0
7328 { 7328 {
7329 m_host.BaseMask = (uint)value; 7329 m_host.BaseMask = (uint)value;
7330 } 7330 }
7331 7331
7332 else if (mask == BuiltIn_Commands_BaseClass.MASK_OWNER)//1 7332 else if (mask == ScriptBaseClass.MASK_OWNER)//1
7333 { 7333 {
7334 m_host.OwnerMask = (uint)value; 7334 m_host.OwnerMask = (uint)value;
7335 } 7335 }
7336 7336
7337 else if (mask == BuiltIn_Commands_BaseClass.MASK_GROUP)//2 7337 else if (mask == ScriptBaseClass.MASK_GROUP)//2
7338 { 7338 {
7339 m_host.GroupMask = (uint)value; 7339 m_host.GroupMask = (uint)value;
7340 } 7340 }
7341 7341
7342 else if (mask == BuiltIn_Commands_BaseClass.MASK_EVERYONE)//3 7342 else if (mask == ScriptBaseClass.MASK_EVERYONE)//3
7343 { 7343 {
7344 m_host.EveryoneMask = (uint)value; 7344 m_host.EveryoneMask = (uint)value;
7345 } 7345 }
7346 7346
7347 else if (mask == BuiltIn_Commands_BaseClass.MASK_NEXT)//4 7347 else if (mask == ScriptBaseClass.MASK_NEXT)//4
7348 { 7348 {
7349 m_host.NextOwnerMask = (uint)value; 7349 m_host.NextOwnerMask = (uint)value;
7350 } 7350 }
@@ -7767,7 +7767,7 @@ namespace OpenSim.Region.ScriptEngine.Common
7767 return new LSL_Vector(); 7767 return new LSL_Vector();
7768 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 7768 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
7769 return new LSL_Vector(); 7769 return new LSL_Vector();
7770 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA) == 0) 7770 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
7771 { 7771 {
7772 ShoutError("No permissions to track the camera"); 7772 ShoutError("No permissions to track the camera");
7773 return new LSL_Vector(); 7773 return new LSL_Vector();
@@ -7913,7 +7913,7 @@ namespace OpenSim.Region.ScriptEngine.Common
7913 // we need the permission first, to know which avatar we want to set the camera for 7913 // we need the permission first, to know which avatar we want to set the camera for
7914 UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 7914 UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
7915 if (agentID == UUID.Zero) return; 7915 if (agentID == UUID.Zero) return;
7916 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 7916 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
7917 7917
7918 ScenePresence presence = World.GetScenePresence(agentID); 7918 ScenePresence presence = World.GetScenePresence(agentID);
7919 7919
@@ -7928,9 +7928,9 @@ namespace OpenSim.Region.ScriptEngine.Common
7928 7928
7929 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 7929 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
7930 switch (type) { 7930 switch (type) {
7931 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS: 7931 case ScriptBaseClass.CAMERA_FOCUS:
7932 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET: 7932 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
7933 case BuiltIn_Commands_BaseClass.CAMERA_POSITION: 7933 case ScriptBaseClass.CAMERA_POSITION:
7934 LSL_Vector v = (LSL_Vector)data[i]; 7934 LSL_Vector v = (LSL_Vector)data[i];
7935 parameters.Add(type + 1, (float)v.x); 7935 parameters.Add(type + 1, (float)v.x);
7936 parameters.Add(type + 2, (float)v.y); 7936 parameters.Add(type + 2, (float)v.y);
@@ -7964,7 +7964,7 @@ namespace OpenSim.Region.ScriptEngine.Common
7964 // we need the permission first, to know which avatar we want to clear the camera for 7964 // we need the permission first, to know which avatar we want to clear the camera for
7965 UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 7965 UUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
7966 if (agentID == UUID.Zero) return; 7966 if (agentID == UUID.Zero) return;
7967 if ((m_host.TaskInventory[invItemID].PermsMask & BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 7967 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
7968 7968
7969 ScenePresence presence = World.GetScenePresence(agentID); 7969 ScenePresence presence = World.GetScenePresence(agentID);
7970 7970
@@ -7980,27 +7980,27 @@ namespace OpenSim.Region.ScriptEngine.Common
7980 LSL_List nums = LSL_List.ToDoubleList(src); 7980 LSL_List nums = LSL_List.ToDoubleList(src);
7981 switch (operation) 7981 switch (operation)
7982 { 7982 {
7983 case BuiltIn_Commands_BaseClass.LIST_STAT_RANGE: 7983 case ScriptBaseClass.LIST_STAT_RANGE:
7984 return nums.Range(); 7984 return nums.Range();
7985 case BuiltIn_Commands_BaseClass.LIST_STAT_MIN: 7985 case ScriptBaseClass.LIST_STAT_MIN:
7986 return nums.Min(); 7986 return nums.Min();
7987 case BuiltIn_Commands_BaseClass.LIST_STAT_MAX: 7987 case ScriptBaseClass.LIST_STAT_MAX:
7988 return nums.Max(); 7988 return nums.Max();
7989 case BuiltIn_Commands_BaseClass.LIST_STAT_MEAN: 7989 case ScriptBaseClass.LIST_STAT_MEAN:
7990 return nums.Mean(); 7990 return nums.Mean();
7991 case BuiltIn_Commands_BaseClass.LIST_STAT_MEDIAN: 7991 case ScriptBaseClass.LIST_STAT_MEDIAN:
7992 return nums.Median(); 7992 return nums.Median();
7993 case BuiltIn_Commands_BaseClass.LIST_STAT_NUM_COUNT: 7993 case ScriptBaseClass.LIST_STAT_NUM_COUNT:
7994 return nums.NumericLength(); 7994 return nums.NumericLength();
7995 case BuiltIn_Commands_BaseClass.LIST_STAT_STD_DEV: 7995 case ScriptBaseClass.LIST_STAT_STD_DEV:
7996 return nums.StdDev(); 7996 return nums.StdDev();
7997 case BuiltIn_Commands_BaseClass.LIST_STAT_SUM: 7997 case ScriptBaseClass.LIST_STAT_SUM:
7998 return nums.Sum(); 7998 return nums.Sum();
7999 case BuiltIn_Commands_BaseClass.LIST_STAT_SUM_SQUARES: 7999 case ScriptBaseClass.LIST_STAT_SUM_SQUARES:
8000 return nums.SumSqrs(); 8000 return nums.SumSqrs();
8001 case BuiltIn_Commands_BaseClass.LIST_STAT_GEOMETRIC_MEAN: 8001 case ScriptBaseClass.LIST_STAT_GEOMETRIC_MEAN:
8002 return nums.GeometricMean(); 8002 return nums.GeometricMean();
8003 case BuiltIn_Commands_BaseClass.LIST_STAT_HARMONIC_MEAN: 8003 case ScriptBaseClass.LIST_STAT_HARMONIC_MEAN:
8004 return nums.HarmonicMean(); 8004 return nums.HarmonicMean();
8005 default: 8005 default:
8006 return 0.0; 8006 return 0.0;
@@ -8302,9 +8302,9 @@ namespace OpenSim.Region.ScriptEngine.Common
8302 public LSL_String llStringTrim(string src, int type) 8302 public LSL_String llStringTrim(string src, int type)
8303 { 8303 {
8304 m_host.AddScriptLPS(1); 8304 m_host.AddScriptLPS(1);
8305 if (type == (int)BuiltIn_Commands_BaseClass.STRING_TRIM_HEAD) { return src.TrimStart(); } 8305 if (type == (int)ScriptBaseClass.STRING_TRIM_HEAD) { return src.TrimStart(); }
8306 if (type == (int)BuiltIn_Commands_BaseClass.STRING_TRIM_TAIL) { return src.TrimEnd(); } 8306 if (type == (int)ScriptBaseClass.STRING_TRIM_TAIL) { return src.TrimEnd(); }
8307 if (type == (int)BuiltIn_Commands_BaseClass.STRING_TRIM) { return src.Trim(); } 8307 if (type == (int)ScriptBaseClass.STRING_TRIM) { return src.Trim(); }
8308 return src; 8308 return src;
8309 } 8309 }
8310 8310
@@ -8403,7 +8403,7 @@ namespace OpenSim.Region.ScriptEngine.Common
8403 8403
8404 internal void ShoutError(string msg) 8404 internal void ShoutError(string msg)
8405 { 8405 {
8406 llShout(BuiltIn_Commands_BaseClass.DEBUG_CHANNEL, msg); 8406 llShout(ScriptBaseClass.DEBUG_CHANNEL, msg);
8407 } 8407 }
8408 8408
8409 8409
@@ -8478,7 +8478,7 @@ namespace OpenSim.Region.ScriptEngine.Common
8478 m_localID, m_itemID, rq.ToString()); 8478 m_localID, m_itemID, rq.ToString());
8479 8479
8480 m_ScriptEngine.m_ASYNCLSLCommandManager. 8480 m_ScriptEngine.m_ASYNCLSLCommandManager.
8481 m_Dataserver.DataserverReply(rq.ToString(), BuiltIn_Commands_BaseClass.EOF); 8481 m_Dataserver.DataserverReply(rq.ToString(), ScriptBaseClass.EOF);
8482 return tid.ToString(); 8482 return tid.ToString();
8483 } 8483 }
8484 } 8484 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 803fdb1..b50e823 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -334,7 +334,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
334 compileScript = String.Empty + 334 compileScript = String.Empty +
335 "import OpenSim.Region.ScriptEngine.Common; import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + 335 "import OpenSim.Region.ScriptEngine.Common; import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
336 "package SecondLife {\r\n" + 336 "package SecondLife {\r\n" +
337 "class Script extends OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + 337 "class Script extends OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" +
338 compileScript + 338 compileScript +
339 "} }\r\n"; 339 "} }\r\n";
340 return compileScript; 340 return compileScript;
@@ -345,7 +345,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
345 compileScript = String.Empty + 345 compileScript = String.Empty +
346 "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + 346 "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" +
347 String.Empty + "namespace SecondLife { " + 347 String.Empty + "namespace SecondLife { " +
348 String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + 348 String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" +
349 @"public Script() { } " + 349 @"public Script() { } " +
350 compileScript + 350 compileScript +
351 "} }\r\n"; 351 "} }\r\n";
@@ -358,7 +358,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
358 "using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; " + 358 "using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; " +
359 "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" + 359 "using OpenSim.Region.ScriptEngine.Common; using OpenSim.Region.ScriptEngine.Shared; using System.Collections.Generic;\r\n" +
360 String.Empty + "namespace SecondLife { " + 360 String.Empty + "namespace SecondLife { " +
361 String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { \r\n" + 361 String.Empty + "public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass { \r\n" +
362 //@"public Script() { } " + 362 //@"public Script() { } " +
363 @"static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; " + 363 @"static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; " +
364 @"public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } "+ 364 @"public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } "+
@@ -373,7 +373,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
373 compileScript = String.Empty + 373 compileScript = String.Empty +
374 "Imports OpenSim.Region.ScriptEngine.Common: Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " + 374 "Imports OpenSim.Region.ScriptEngine.Common: Imports OpenSim.Region.ScriptEngine.Shared: Imports System.Collections.Generic: " +
375 String.Empty + "NameSpace SecondLife:" + 375 String.Empty + "NameSpace SecondLife:" +
376 String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass: " + 376 String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.ScriptBaseClass: " +
377 "\r\nPublic Sub New()\r\nEnd Sub: " + 377 "\r\nPublic Sub New()\r\nEnd Sub: " +
378 compileScript + 378 compileScript +
379 ":End Class :End Namespace\r\n"; 379 ":End Class :End Namespace\r\n";
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT
index 5e0863f..3c11938 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/README.TXT
@@ -268,7 +268,7 @@ PrologCallback sayit(object ans)
268Generated CS Code 268Generated CS Code
269 =================================== 269 ===================================
270using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog;using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; 270using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog;using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;
271namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { 271namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass {
272static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null;public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } 272static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null;public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); }
273//cs 273//cs
274 public void default_event_touch_start(int N ) 274 public void default_event_touch_start(int N )
@@ -411,7 +411,7 @@ Generated CS Code
411 =================================== 411 ===================================
412 412
413using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic; 413using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog; using OpenSim.Region.ScriptEngine.Common; using System.Collections.Generic;
414namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.BuiltIn_Commands_BaseClass { 414namespace SecondLife { public class Script : OpenSim.Region.ScriptEngine.Common.ScriptBaseClass {
415static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); } 415static OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP YP=null; public Script() { YP= new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog.YP(); }
416//cs 416//cs
417 417
generated by cgit v1.1 at 2024-11-05 14:06:13 +0000