aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-13 20:48:50 +0000
committerJustin Clark-Casey (justincc)2012-02-13 20:48:50 +0000
commit21393af631c743f0ee0094a20a9fa9f2aeb2e500 (patch)
treedd74990b038ca912b6a0fe42a8a3305f9e51c7f2 /OpenSim/Framework/RegionInfo.cs
parentOn object deserialization, go back to logging errors at DEBUG level rather th... (diff)
parentcorrect the default avatar_terminal_velocity value that I accidentally left i... (diff)
downloadopensim-SC-21393af631c743f0ee0094a20a9fa9f2aeb2e500.zip
opensim-SC-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.gz
opensim-SC-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.bz2
opensim-SC-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 661b457..5ba3863 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -625,7 +625,6 @@ namespace OpenSim.Framework
625 625
626 foreach (String s in allKeys) 626 foreach (String s in allKeys)
627 { 627 {
628 string val = config.GetString(s);
629 SetOtherSetting(s, config.GetString(s)); 628 SetOtherSetting(s, config.GetString(s));
630 } 629 }
631 } 630 }