diff options
| author | Melanie | 2013-03-14 22:34:15 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-14 22:34:15 +0000 |
| commit | 8b657773e4305dc853802017b3353d8d85872e14 (patch) | |
| tree | 9810e0c221baf927110b34a2d0545182e25595fd /OpenSim/Framework/DAMap.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation() (diff) | |
| download | opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.zip opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.gz opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.bz2 opensim-SC_OLD-8b657773e4305dc853802017b3353d8d85872e14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/DAMap.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 64cea77..df4a6bc 100644 --- a/OpenSim/Framework/DAMap.cs +++ b/OpenSim/Framework/DAMap.cs | |||
| @@ -180,7 +180,7 @@ namespace OpenSim.Framework | |||
| 180 | /// Validate the key used for storing separate data stores. | 180 | /// Validate the key used for storing separate data stores. |
| 181 | /// </summary> | 181 | /// </summary> |
| 182 | /// <param name='key'></param> | 182 | /// <param name='key'></param> |
| 183 | private static void ValidateKey(string key) | 183 | public static void ValidateKey(string key) |
| 184 | { | 184 | { |
| 185 | if (key.Length < MIN_STORE_NAME_LENGTH) | 185 | if (key.Length < MIN_STORE_NAME_LENGTH) |
| 186 | throw new Exception("Minimum store name length is " + MIN_STORE_NAME_LENGTH); | 186 | throw new Exception("Minimum store name length is " + MIN_STORE_NAME_LENGTH); |