ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-01-16 01:11:20 +00:00
parent b924e333b7 8bf0a9f85d
commit fc5711fa7a
29 changed files with 512 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
View File

@@ -49,7 +49,7 @@ namespace OpenSim.Region.Physics.POSPlugin
public PhysicsScene GetScene(string sceneIdentifier)
{
return new POSScene(sceneIdentifier);
return new POSScene(GetName(), sceneIdentifier);
}
public string GetName()

4
OpenSim/Region/Physics/POSPlugin/POSScene.cs
View File

@@ -43,8 +43,10 @@ namespace OpenSim.Region.Physics.POSPlugin
//protected internal string sceneIdentifier;
public POSScene(String _sceneIdentifier)
public POSScene(string engineType, String _sceneIdentifier)
{
EngineType = engineType;
Name = EngineType + "/" + _sceneIdentifier;
//sceneIdentifier = _sceneIdentifier;
}