Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-21 03:51:58 +01:00
245 changed files with 6014 additions and 4908 deletions

View File

@@ -76,5 +76,8 @@ namespace OpenSim.Region.Framework.Interfaces
void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
void SetParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime);
void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
}
}