From cd72e7b701152269296d0aef97ae99258efe245a Mon Sep 17 00:00:00 2001 From: Jak Daniels Date: Thu, 7 Apr 2016 18:21:58 +0100 Subject: [PATCH] remove CR from all .cs files --- .gitattributes | 2 +- Module/BirdsModule/FlockingView.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8d09dc3..f12e956 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ # Auto detect text files and perform LF normalization * text=auto -*.cs text diff=csharp +*.cs text diff=csharp eol=lf *.java text diff=java *.html text diff=html *.css text diff --git a/Module/BirdsModule/FlockingView.cs b/Module/BirdsModule/FlockingView.cs index 3d9fb3a..5dda6dd 100644 --- a/Module/BirdsModule/FlockingView.cs +++ b/Module/BirdsModule/FlockingView.cs @@ -92,17 +92,17 @@ namespace Flocking m_log.InfoFormat("[{0}]: Adding prim {1} in region {2}", m_name, bird.Id, m_scene.RegionInfo.RegionName); SceneObjectGroup group = findByName (m_birdPrim); sog = CopyPrim (group, bird.Id); - rootPart = sog.RootPart; - rootPart.AddFlag(PrimFlags.Temporary); + rootPart = sog.RootPart; + rootPart.AddFlag(PrimFlags.Temporary); rootPart.AddFlag(PrimFlags.Phantom); //set prim to phantom - //sog.UpdatePrimFlags(rootPart.LocalId, false, false, true, false); + //sog.UpdatePrimFlags(rootPart.LocalId, false, false, true, false); m_sogMap [bird.Id] = sog; m_scene.AddNewSceneObject (sog, false); // Fire script on_rez sog.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 1); rootPart.ParentGroup.ResumeScripts(); - rootPart.ScheduleFullUpdate(); + rootPart.ScheduleFullUpdate(); sog.DetachFromBackup(); } else { sog = existing.ParentGroup;