diff options
author | BlueWall | 2011-03-17 05:48:42 -0400 |
---|---|---|
committer | BlueWall | 2011-03-17 05:48:42 -0400 |
commit | a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f (patch) | |
tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.zip opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.gz opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.bz2 opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.xz |
Thanks Kevin Cozens for a patch that:
Fixes several spelling mistakes
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/UndoStack.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs index 129a544..2c2b47d 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
83 | /// <summary> | 83 | /// <summary> |
84 | /// Regular expression used to match against path of the | 84 | /// Regular expression used to match against path of the |
85 | /// incoming HTTP request. If you want to match any string | 85 | /// incoming HTTP request. If you want to match any string |
86 | /// either use '.*' or null. To match on the emtpy string use | 86 | /// either use '.*' or null. To match on the empty string use |
87 | /// '^$'. | 87 | /// '^$'. |
88 | /// </summary> | 88 | /// </summary> |
89 | public virtual Regex Path | 89 | public virtual Regex Path |
diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs index 4d800ae..fde63b1 100644 --- a/OpenSim/Framework/UndoStack.cs +++ b/OpenSim/Framework/UndoStack.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Framework | |||
90 | return deleted; | 90 | return deleted; |
91 | } | 91 | } |
92 | else | 92 | else |
93 | throw new InvalidOperationException("Cannot pop from emtpy stack"); | 93 | throw new InvalidOperationException("Cannot pop from empty stack"); |
94 | } | 94 | } |
95 | 95 | ||
96 | public T Peek() | 96 | public T Peek() |