diff options
| author | Melanie | 2009-09-27 21:25:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-27 21:25:10 +0100 |
| commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
| tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /OpenSim/Services/GridService/GridServiceBase.cs | |
| parent | Add the Migration for the regions table (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to 'OpenSim/Services/GridService/GridServiceBase.cs')
| -rw-r--r-- | OpenSim/Services/GridService/GridServiceBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs index 7522e64..444f79b 100644 --- a/OpenSim/Services/GridService/GridServiceBase.cs +++ b/OpenSim/Services/GridService/GridServiceBase.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Services.GridService | |||
| 68 | connString = gridConfig.GetString("ConnectionString", connString); | 68 | connString = gridConfig.GetString("ConnectionString", connString); |
| 69 | realm = gridConfig.GetString("Realm", realm); | 69 | realm = gridConfig.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 | // |