aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-29 16:21:41 +0000
committerTeravus Ovares2008-05-29 16:21:41 +0000
commit83bd85ce7fed09be34df870dd6473c123e592744 (patch)
tree9240ac61600a1a1b1b5f445782010e0899920790 /OpenSim/Region/Environment/Scenes
parentthis is a snapshot of the OSHttpServer work-in-progress. it's an initial skel... (diff)
downloadopensim-SC-83bd85ce7fed09be34df870dd6473c123e592744.zip
opensim-SC-83bd85ce7fed09be34df870dd6473c123e592744.tar.gz
opensim-SC-83bd85ce7fed09be34df870dd6473c123e592744.tar.bz2
opensim-SC-83bd85ce7fed09be34df870dd6473c123e592744.tar.xz
* Fix string literal with URL + LLcommand();
* Added 'detected around: value' when a x.Y detect occurs to help debug. * Fixed object text is too long to store to the database (wikilith)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs10
2 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 47a239a..94d888c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -270,7 +270,14 @@ namespace OpenSim.Region.Environment.Scenes
270 270
271 public string Text 271 public string Text
272 { 272 {
273 get { return m_rootPart.Text; } 273 get {
274 string returnstr = m_rootPart.Text;
275 if (returnstr.Length > 255)
276 {
277 returnstr = returnstr.Substring(0, 255);
278 }
279 return returnstr;
280 }
274 set { m_rootPart.Text = value; } 281 set { m_rootPart.Text = value; }
275 } 282 }
276 283
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 9afffbe..de5da40 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -585,7 +585,15 @@ namespace OpenSim.Region.Environment.Scenes
585 585
586 public string Text 586 public string Text
587 { 587 {
588 get { return m_text; } 588 get
589 {
590 string returnstr = m_text;
591 if (returnstr.Length > 255)
592 {
593 returnstr = returnstr.Substring(0, 254);
594 }
595 return returnstr;
596 }
589 set 597 set
590 { 598 {
591 m_text = value; 599 m_text = value;