aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/Resources/AssetStore.migrations2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index 3fd58b7..9c55630 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -73,5 +73,5 @@ ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
73 73
74:VERSION 8 74:VERSION 8
75 75
76alter table assets add CreatorID varchar(36) not null default '' 76ALTER TABLE assets ADD COLUMN CreatorID varchar(36) NOT NULL DEFAULT '';
77 77
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 2352ced..901dcba 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -502,8 +502,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
502 group.RootPart.IsAttachment = true; 502 group.RootPart.IsAttachment = true;
503 } 503 }
504 504
505 // For attachments, we must make sure that only a single object update occurs after we've finished 505 // If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since
506 // all the necessary operations. 506 // we'll be doing that later on. Scheduling more than one full update during the attachment
507 // process causes some clients to fail to display the attachment properly.
507 m_Scene.AddNewSceneObject(group, true, false); 508 m_Scene.AddNewSceneObject(group, true, false);
508 509
509 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); 510 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 71c8018..2357c6b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3479,7 +3479,7 @@ namespace OpenSim.Region.Framework.Scenes
3479 /// <param name="alpha"></param> 3479 /// <param name="alpha"></param>
3480 public void SetText(string text, Vector3 color, double alpha) 3480 public void SetText(string text, Vector3 color, double alpha)
3481 { 3481 {
3482 Color = Color.FromArgb(0xff - (int) (alpha*0xff), 3482 Color = Color.FromArgb((int) (alpha*0xff),
3483 (int) (color.X*0xff), 3483 (int) (color.X*0xff),
3484 (int) (color.Y*0xff), 3484 (int) (color.Y*0xff),
3485 (int) (color.Z*0xff)); 3485 (int) (color.Z*0xff));
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ad7c3ae..3964b0b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1671,8 +1671,7 @@ namespace OpenSim.Region.Framework.Scenes
1671 /// </summary> 1671 /// </summary>
1672 public void StandUp() 1672 public void StandUp()
1673 { 1673 {
1674 if (SitGround) 1674 SitGround = false;
1675 SitGround = false;
1676 1675
1677 if (m_parentID != 0) 1676 if (m_parentID != 0)
1678 { 1677 {