diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetTexture')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index e1b4fe7..245d931 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
| @@ -350,7 +350,5 @@ namespace OpenSim.Capabilities.Handlers | |||
| 350 | } | 350 | } |
| 351 | return null; | 351 | return null; |
| 352 | } | 352 | } |
| 353 | |||
| 354 | |||
| 355 | } | 353 | } |
| 356 | } | 354 | } \ No newline at end of file |