diff options
Diffstat (limited to 'OpenSim')
3 files changed, 5 insertions, 4 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 | ||
76 | alter table assets add CreatorID varchar(36) not null default '' | 76 | ALTER 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 d174d04..683df93 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3466,7 +3466,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3466 | /// <param name="alpha"></param> | 3466 | /// <param name="alpha"></param> |
3467 | public void SetText(string text, Vector3 color, double alpha) | 3467 | public void SetText(string text, Vector3 color, double alpha) |
3468 | { | 3468 | { |
3469 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), | 3469 | Color = Color.FromArgb((int) (alpha*0xff), |
3470 | (int) (color.X*0xff), | 3470 | (int) (color.X*0xff), |
3471 | (int) (color.Y*0xff), | 3471 | (int) (color.Y*0xff), |
3472 | (int) (color.Z*0xff)); | 3472 | (int) (color.Z*0xff)); |