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/Services/AvatarService/AvatarServiceBase.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/Services/AvatarService/AvatarServiceBase.cs')
| -rw-r--r-- | OpenSim/Services/AvatarService/AvatarServiceBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs index ab9d7cd..c1c4fb7 100644 --- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs +++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Services.AvatarService | |||
| 68 | connString = presenceConfig.GetString("ConnectionString", connString); | 68 | connString = presenceConfig.GetString("ConnectionString", connString); |
| 69 | realm = presenceConfig.GetString("Realm", realm); | 69 | realm = presenceConfig.GetString("Realm", realm); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | // | 72 | // |
| 73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
| 74 | // | 74 | // |