diff options
| author | Melanie | 2010-03-06 12:24:09 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-06 12:24:09 +0000 |
| commit | 1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch) | |
| tree | 69419084feb98d59888b59a643e5fa062314605d /OpenSim/Framework/RegionInfo.cs | |
| parent | Remove a superfluous array creation (diff) | |
| parent | - implementing server 1.38 functions (diff) | |
| download | opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 1ea08f9..99edd99 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -790,7 +790,6 @@ namespace OpenSim.Framework | |||
| 790 | else | 790 | else |
| 791 | m_externalHostName = externalName; | 791 | m_externalHostName = externalName; |
| 792 | 792 | ||
| 793 | |||
| 794 | // Master avatar cruft | 793 | // Master avatar cruft |
| 795 | // | 794 | // |
| 796 | string masterAvatarUUID; | 795 | string masterAvatarUUID; |