diff options
author | Melanie | 2010-10-21 07:33:01 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 07:33:01 +0100 |
commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Framework/Capabilities | |
parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
parent | Skip empty strings in ParseString* functions (diff) | |
download | opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Capabilities/CapsUtil.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs index 0334e4b..faf2708 100644 --- a/OpenSim/Framework/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/Capabilities/CapsUtil.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Capabilities | |||
41 | /// <returns></returns> | 41 | /// <returns></returns> |
42 | public static string GetCapsSeedPath(string capsObjectPath) | 42 | public static string GetCapsSeedPath(string capsObjectPath) |
43 | { | 43 | { |
44 | return "/CAPS/" + capsObjectPath + "0000/"; | 44 | return "CAPS/" + capsObjectPath + "0000/"; |
45 | } | 45 | } |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |