diff options
| author | Melanie | 2012-10-16 04:30:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-16 04:30:01 +0100 |
| commit | fa52effb279355ef731725c04c3b659f972f3903 (patch) | |
| tree | 7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim/Services/Connectors/Friends | |
| parent | Fix a merge issue (diff) | |
| parent | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff) | |
| download | opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.zip opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.gz opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2 opensim-SC_OLD-fa52effb279355ef731725c04c3b659f972f3903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Friends')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 6cd21d1..4ec1edc 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | |||
| @@ -154,7 +154,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
| 154 | if (!region.ServerURI.EndsWith("/")) | 154 | if (!region.ServerURI.EndsWith("/")) |
| 155 | path = "/" + path; | 155 | path = "/" + path; |
| 156 | string uri = region.ServerURI + path; | 156 | string uri = region.ServerURI + path; |
| 157 | m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri); | 157 | // m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri); |
| 158 | 158 | ||
| 159 | try | 159 | try |
| 160 | { | 160 | { |