Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs
This commit is contained in:
Melanie
2012-04-11 23:35:27 +01:00
13 changed files with 171 additions and 25 deletions

View File

@@ -47,5 +47,8 @@ namespace OpenSim.Region.Framework.Interfaces
void sendRegionHandshakeToAll();
void TriggerEstateInfoChange();
void TriggerRegionInfoChange();
void setEstateTerrainBaseTexture(int level, UUID texture);
void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
}
}