remove CR from all .cs files
parent
cf4aeac0e5
commit
cd72e7b701
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue