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

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
View File

@@ -127,12 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
/// <param name="options">
/// Dictionary of options.
<<<<<<< HEAD
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
=======
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options);
>>>>>>> avn/ubitvar
}
}