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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
This commit is contained in:
Melanie
2012-02-23 01:49:14 +00:00
parent c0b8f3d0bc 9ed4245d9e
commit f1a76195ea
8 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Interfaces/ISimulationService.cs
View File

@@ -106,7 +106,7 @@ namespace OpenSim.Services.Interfaces
/// <param name="sog"></param>
/// <param name="isLocalCall"></param>
/// <returns></returns>
bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall);
bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall);
/// <summary>
/// Create an object from the user's inventory in the destination region.