Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-11-17 02:58:14 +00:00
13 changed files with 261 additions and 49 deletions

View File

@@ -1053,7 +1053,7 @@ namespace OpenSim.Framework
event MuteListEntryRemove OnRemoveMuteListEntry;
event GodlikeMessage onGodlikeMessage;
event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
event GenericCall2 OnUpdateThrottles;
/// <summary>
/// Set the debug level at which packet output should be printed to console.
/// </summary>