diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
| commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
| tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Services/Interfaces/ISimulationService.cs | |
| parent | Amend to last commit: synchronize access to queues. (diff) | |
| parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
| download | opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Services/Interfaces/ISimulationService.cs')
| -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 5f9ce6d..36fd6fc 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
| @@ -98,7 +98,7 @@ namespace OpenSim.Services.Interfaces | |||
| 98 | /// <param name="sog"></param> | 98 | /// <param name="sog"></param> |
| 99 | /// <param name="isLocalCall"></param> | 99 | /// <param name="isLocalCall"></param> |
| 100 | /// <returns></returns> | 100 | /// <returns></returns> |
| 101 | bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall); | 101 | bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall); |
| 102 | 102 | ||
| 103 | /// <summary> | 103 | /// <summary> |
| 104 | /// Create an object from the user's inventory in the destination region. | 104 | /// Create an object from the user's inventory in the destination region. |