diff options
| author | Melanie | 2012-02-23 01:49:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-23 01:49:14 +0000 |
| commit | f1a76195ea58b8efb22f6f56980c1d7960e195b8 (patch) | |
| tree | 972beaa1d2a234f7792d9beaedbdef58e963c690 /OpenSim/Services/Interfaces | |
| parent | Add permission checks to scripted object movements, which didn't respect bans (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.zip opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.gz opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.bz2 opensim-SC-f1a76195ea58b8efb22f6f56980c1d7960e195b8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/ISimulationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index ae6bd72..7940256 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
| @@ -106,7 +106,7 @@ namespace OpenSim.Services.Interfaces | |||
| 106 | /// <param name="sog"></param> | 106 | /// <param name="sog"></param> |
| 107 | /// <param name="isLocalCall"></param> | 107 | /// <param name="isLocalCall"></param> |
| 108 | /// <returns></returns> | 108 | /// <returns></returns> |
| 109 | bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall); | 109 | bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall); |
| 110 | 110 | ||
| 111 | /// <summary> | 111 | /// <summary> |
| 112 | /// Create an object from the user's inventory in the destination region. | 112 | /// Create an object from the user's inventory in the destination region. |