ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs
This commit is contained in:
Melanie
2012-10-18 20:56:34 +01:00
parent caf2dcde70 2e8e8d576e
commit 72c925a6c9
23 changed files with 2359 additions and 1226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -4386,8 +4386,8 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
parts[i].CheckSculptAndLoad();
// for (int i = 0; i < parts.Length; i++)
// parts[i].CheckSculptAndLoad();
}
/// <summary>