diff options
author | UbitUmarov | 2019-01-30 00:12:46 +0000 |
---|---|---|
committer | UbitUmarov | 2019-01-30 00:12:46 +0000 |
commit | eb7715e2f8f18dedd850bba990e77fa06d7641fd (patch) | |
tree | fef775cef52601ea8336a3e04354dccccf4598e3 /OpenSim/Region/CoreModules/Scripting | |
parent | actually .. do take the trim out (diff) | |
download | opensim-SC-eb7715e2f8f18dedd850bba990e77fa06d7641fd.zip opensim-SC-eb7715e2f8f18dedd850bba990e77fa06d7641fd.tar.gz opensim-SC-eb7715e2f8f18dedd850bba990e77fa06d7641fd.tar.bz2 opensim-SC-eb7715e2f8f18dedd850bba990e77fa06d7641fd.tar.xz |
a few changes to last commits
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index c9423f0..aabf674 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -504,10 +504,24 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
504 | 504 | ||
505 | foreach (string line in GetLines(data, dataDelim)) | 505 | foreach (string line in GetLines(data, dataDelim)) |
506 | { | 506 | { |
507 | string nextLine = line.Trim(); | 507 | string nextLine = line.TrimStart(); |
508 | 508 | ||
509 | // m_log.DebugFormat("[VECTOR RENDER MODULE]: Processing line '{0}'", nextLine); | 509 | // m_log.DebugFormat("[VECTOR RENDER MODULE]: Processing line '{0}'", nextLine); |
510 | 510 | ||
511 | if (nextLine.StartsWith("Text") && nextLine.Length > 5) | ||
512 | { | ||
513 | int start = 4; | ||
514 | if (nextLine[4] == ' ') | ||
515 | start++; | ||
516 | if (start < nextLine.Length) | ||
517 | { | ||
518 | nextLine = nextLine.Substring(start); | ||
519 | graph.DrawString(nextLine, myFont, myBrush, startPoint); | ||
520 | } | ||
521 | continue; | ||
522 | } | ||
523 | |||
524 | nextLine = nextLine.TrimEnd(); | ||
511 | if (nextLine.StartsWith("ResetTransf")) | 525 | if (nextLine.StartsWith("ResetTransf")) |
512 | { | 526 | { |
513 | graph.ResetTransform(); | 527 | graph.ResetTransform(); |
@@ -552,14 +566,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
552 | startPoint.X = endPoint.X; | 566 | startPoint.X = endPoint.X; |
553 | startPoint.Y = endPoint.Y; | 567 | startPoint.Y = endPoint.Y; |
554 | } | 568 | } |
555 | else if (nextLine.StartsWith("Text")) | ||
556 | { | ||
557 | int start = 4; | ||
558 | if(nextLine[4] == ' ') | ||
559 | start++; | ||
560 | nextLine = nextLine.Substring(start); | ||
561 | graph.DrawString(nextLine, myFont, myBrush, startPoint); | ||
562 | } | ||
563 | else if (nextLine.StartsWith("Image")) | 569 | else if (nextLine.StartsWith("Image")) |
564 | { | 570 | { |
565 | // We cannot reuse any generated texture involving fetching an image via HTTP since that image | 571 | // We cannot reuse any generated texture involving fetching an image via HTTP since that image |