diff options
| author | Melanie | 2011-02-16 02:41:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-16 02:41:49 +0000 |
| commit | ccd6e5d07146b8dd033bd1af09594834e87a883b (patch) | |
| tree | e7ed9506d70d67c37ac8d40f9620cbaa24747305 /OpenSim/Region/CoreModules/Framework | |
| parent | Add the country functions in the careminster API (diff) | |
| parent | Catch HttpServer exception: mantis #5381 (diff) | |
| download | opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.zip opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.gz opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.bz2 opensim-SC_OLD-ccd6e5d07146b8dd033bd1af09594834e87a883b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index ca29a7c..e8f18e7 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 244 | } | 244 | } |
| 245 | catch (Exception e) | 245 | catch (Exception e) |
| 246 | { | 246 | { |
| 247 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace); | 247 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0} {1}", e.Message, e.StackTrace); |
| 248 | sp.ControllingClient.SendTeleportFailed("Internal error"); | 248 | sp.ControllingClient.SendTeleportFailed("Internal error"); |
| 249 | } | 249 | } |
| 250 | } | 250 | } |