diff options
* AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility.
* Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 63b4773..bc47241 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -459,7 +459,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
459 | 459 | ||
460 | public void llSetColor(LSL_Types.Vector3 color, int face) | 460 | public void llSetColor(LSL_Types.Vector3 color, int face) |
461 | { | 461 | { |
462 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 462 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
463 | LLColor texcolor; | 463 | LLColor texcolor; |
464 | if (face > -1) | 464 | if (face > -1) |
465 | { | 465 | { |
@@ -498,7 +498,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
498 | 498 | ||
499 | public double llGetAlpha(int face) | 499 | public double llGetAlpha(int face) |
500 | { | 500 | { |
501 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 501 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
502 | if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color | 502 | if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color |
503 | { | 503 | { |
504 | return (double)((tex.DefaultTexture.RGBA.A * 255) / 255); | 504 | return (double)((tex.DefaultTexture.RGBA.A * 255) / 255); |
@@ -512,7 +512,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
512 | 512 | ||
513 | public void llSetAlpha(double alpha, int face) | 513 | public void llSetAlpha(double alpha, int face) |
514 | { | 514 | { |
515 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 515 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
516 | LLColor texcolor; | 516 | LLColor texcolor; |
517 | if (face > -1) | 517 | if (face > -1) |
518 | { | 518 | { |
@@ -545,7 +545,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
545 | 545 | ||
546 | public LSL_Types.Vector3 llGetColor(int face) | 546 | public LSL_Types.Vector3 llGetColor(int face) |
547 | { | 547 | { |
548 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 548 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
549 | LLColor texcolor; | 549 | LLColor texcolor; |
550 | LSL_Types.Vector3 rgb; | 550 | LSL_Types.Vector3 rgb; |
551 | if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color | 551 | if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color |
@@ -570,7 +570,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
570 | 570 | ||
571 | public void llSetTexture(string texture, int face) | 571 | public void llSetTexture(string texture, int face) |
572 | { | 572 | { |
573 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 573 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
574 | |||
574 | if (face > -1) | 575 | if (face > -1) |
575 | { | 576 | { |
576 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); | 577 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); |
@@ -598,7 +599,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
598 | 599 | ||
599 | public void llScaleTexture(double u, double v, int face) | 600 | public void llScaleTexture(double u, double v, int face) |
600 | { | 601 | { |
601 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 602 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
602 | if (face > -1) | 603 | if (face > -1) |
603 | { | 604 | { |
604 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); | 605 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); |
@@ -629,7 +630,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
629 | 630 | ||
630 | public void llOffsetTexture(double u, double v, int face) | 631 | public void llOffsetTexture(double u, double v, int face) |
631 | { | 632 | { |
632 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 633 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
633 | if (face > -1) | 634 | if (face > -1) |
634 | { | 635 | { |
635 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); | 636 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); |
@@ -660,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
660 | 661 | ||
661 | public void llRotateTexture(double rotation, int face) | 662 | public void llRotateTexture(double rotation, int face) |
662 | { | 663 | { |
663 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 664 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
664 | if (face > -1) | 665 | if (face > -1) |
665 | { | 666 | { |
666 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); | 667 | LLObject.TextureEntryFace texface = tex.CreateFace((uint)face); |
@@ -688,7 +689,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
688 | 689 | ||
689 | public string llGetTexture(int face) | 690 | public string llGetTexture(int face) |
690 | { | 691 | { |
691 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 692 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
692 | if (face == -1) | 693 | if (face == -1) |
693 | { | 694 | { |
694 | face = 0; | 695 | face = 0; |
@@ -1172,7 +1173,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
1172 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); | 1173 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); |
1173 | if (linknumber > -1) | 1174 | if (linknumber > -1) |
1174 | { | 1175 | { |
1175 | LLObject.TextureEntry tex = new LLObject.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | 1176 | LLObject.TextureEntry tex = part.Shape.Textures; |
1176 | LLColor texcolor; | 1177 | LLColor texcolor; |
1177 | if (face > -1) | 1178 | if (face > -1) |
1178 | { | 1179 | { |
@@ -1219,7 +1220,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
1219 | { | 1220 | { |
1220 | linknumber = w; | 1221 | linknumber = w; |
1221 | part = m_host.ParentGroup.GetLinkNumPart(linknumber); | 1222 | part = m_host.ParentGroup.GetLinkNumPart(linknumber); |
1222 | LLObject.TextureEntry tex = new LLObject.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | 1223 | LLObject.TextureEntry tex = part.Shape.Textures; |
1223 | LLColor texcolor; | 1224 | LLColor texcolor; |
1224 | if (face > -1) | 1225 | if (face > -1) |
1225 | { | 1226 | { |
@@ -1467,7 +1468,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
1467 | 1468 | ||
1468 | public LSL_Types.Vector3 llGetTextureOffset(int face) | 1469 | public LSL_Types.Vector3 llGetTextureOffset(int face) |
1469 | { | 1470 | { |
1470 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 1471 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
1471 | LSL_Types.Vector3 offset; | 1472 | LSL_Types.Vector3 offset; |
1472 | if (face == -1) | 1473 | if (face == -1) |
1473 | { | 1474 | { |
@@ -1481,7 +1482,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
1481 | 1482 | ||
1482 | public LSL_Types.Vector3 llGetTextureScale(int side) | 1483 | public LSL_Types.Vector3 llGetTextureScale(int side) |
1483 | { | 1484 | { |
1484 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 1485 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
1485 | LSL_Types.Vector3 scale; | 1486 | LSL_Types.Vector3 scale; |
1486 | if (side == -1) | 1487 | if (side == -1) |
1487 | { | 1488 | { |
@@ -1495,7 +1496,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
1495 | 1496 | ||
1496 | public double llGetTextureRot(int face) | 1497 | public double llGetTextureRot(int face) |
1497 | { | 1498 | { |
1498 | LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); | 1499 | LLObject.TextureEntry tex = m_host.Shape.Textures; |
1499 | if (face == -1) | 1500 | if (face == -1) |
1500 | { | 1501 | { |
1501 | face = 0; | 1502 | face = 0; |
@@ -2413,7 +2414,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
2413 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); | 2414 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); |
2414 | if (linknumber > -1) | 2415 | if (linknumber > -1) |
2415 | { | 2416 | { |
2416 | LLObject.TextureEntry tex = new LLObject.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | 2417 | LLObject.TextureEntry tex = part.Shape.Textures; |
2417 | LLColor texcolor; | 2418 | LLColor texcolor; |
2418 | if (face > -1) | 2419 | if (face > -1) |
2419 | { | 2420 | { |
@@ -2452,7 +2453,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
2452 | { | 2453 | { |
2453 | linknumber = w; | 2454 | linknumber = w; |
2454 | part = m_host.ParentGroup.GetLinkNumPart(linknumber); | 2455 | part = m_host.ParentGroup.GetLinkNumPart(linknumber); |
2455 | LLObject.TextureEntry tex = new LLObject.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | 2456 | LLObject.TextureEntry tex = part.Shape.Textures; |
2456 | LLColor texcolor; | 2457 | LLColor texcolor; |
2457 | if (face > -1) | 2458 | if (face > -1) |
2458 | { | 2459 | { |