diff options
| author | Melanie | 2011-02-05 04:25:14 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-05 04:25:14 +0000 |
| commit | f78831ec9841eccea9ecb4077193e2ae7c3985c3 (patch) | |
| tree | b6118825d9dd4ebfc1f1f1f966009ac30b293af5 /OpenSim/Framework/Util.cs | |
| parent | Fix a typo in the QUERYACCESS method name (diff) | |
| parent | Added an additional debug message, and removed a bunch of files that weren't ... (diff) | |
| download | opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.zip opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.gz opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.bz2 opensim-SC_OLD-f78831ec9841eccea9ecb4077193e2ae7c3985c3.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index d1d8736..533e53a 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1334,6 +1334,11 @@ namespace OpenSim.Framework | |||
| 1334 | return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri; | 1334 | return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri; |
| 1335 | } | 1335 | } |
| 1336 | 1336 | ||
| 1337 | public static byte[] StringToBytes256(string str, params object[] args) | ||
| 1338 | { | ||
| 1339 | return StringToBytes256(string.Format(str, args)); | ||
| 1340 | } | ||
| 1341 | |||
| 1337 | public static byte[] StringToBytes256(string str) | 1342 | public static byte[] StringToBytes256(string str) |
| 1338 | { | 1343 | { |
| 1339 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } | 1344 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } |
| @@ -1352,6 +1357,11 @@ namespace OpenSim.Framework | |||
| 1352 | return data; | 1357 | return data; |
| 1353 | } | 1358 | } |
| 1354 | 1359 | ||
| 1360 | public static byte[] StringToBytes1024(string str, params object[] args) | ||
| 1361 | { | ||
| 1362 | return StringToBytes1024(string.Format(str, args)); | ||
| 1363 | } | ||
| 1364 | |||
| 1355 | public static byte[] StringToBytes1024(string str) | 1365 | public static byte[] StringToBytes1024(string str) |
| 1356 | { | 1366 | { |
| 1357 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } | 1367 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } |