diff options
| author | Melanie | 2010-12-09 02:24:12 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-09 02:24:12 +0000 |
| commit | 7fef89847ca909a16d55b1e8e3080d26f823ae95 (patch) | |
| tree | 70db9afb60625e42b0f48bd83b06eb8cf9fa736e /OpenSim/Services | |
| parent | Plumb a code path for the entity transfer module to ask a destination scene (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-7fef89847ca909a16d55b1e8e3080d26f823ae95.zip opensim-SC-7fef89847ca909a16d55b1e8e3080d26f823ae95.tar.gz opensim-SC-7fef89847ca909a16d55b1e8e3080d26f823ae95.tar.bz2 opensim-SC-7fef89847ca909a16d55b1e8e3080d26f823ae95.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index d25a766..c2f43ca 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 562 | 562 | ||
| 563 | protected virtual string ObjectPath() | 563 | protected virtual string ObjectPath() |
| 564 | { | 564 | { |
| 565 | return "/object/"; | 565 | return "object/"; |
| 566 | } | 566 | } |
| 567 | 567 | ||
| 568 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) | 568 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) |