Merge branch 'master' into diva-textures

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs
index db19527..4fc3e01 100644
--- a/OpenSim/Framework/ISceneObject.cs
+++ b/OpenSim/Framework/ISceneObject.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     public interface ISceneObject
     {
-        UUID UUID { get; }            
+        UUID UUID { get; }
         ISceneObject CloneForNewScene();
         string ToXml2();
         string ExtraToXmlString();