diff options
author | Melanie | 2011-03-21 07:57:56 +0000 |
---|---|---|
committer | Melanie | 2011-03-21 07:57:56 +0000 |
commit | e4f143fb1c9ef13b024a1ebe8be41ebee6476cac (patch) | |
tree | 967eb3af6fd0c5a55997d31bc86c05c7375b18d7 /OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs | |
parent | Don't send a windlight profile to clients if windlight is not set for (diff) | |
parent | Upgrade SQLite: (diff) | |
download | opensim-SC-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.zip opensim-SC-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.gz opensim-SC-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.bz2 opensim-SC-e4f143fb1c9ef13b024a1ebe8be41ebee6476cac.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs | 2 |
1 files changed, 1 insertions, 1 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 |