diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs index 770b1f2..54f3ab6 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs | |||
| @@ -161,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport | |||
| 161 | { | 161 | { |
| 162 | foreach (SceneObjectGroup sog in attachs) | 162 | foreach (SceneObjectGroup sog in attachs) |
| 163 | { | 163 | { |
| 164 | m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", | 164 | m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", |
| 165 | sog.Name, sp.Name, m_scene.RegionInfo.RegionName); | 165 | sog.Name, sp.Name, m_scene.RegionInfo.RegionName); |
| 166 | 166 | ||
| 167 | m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog); | 167 | m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog); |