diff options
author | Melanie | 2011-02-07 22:08:53 +0000 |
---|---|---|
committer | Melanie | 2011-02-07 22:08:53 +0000 |
commit | 3889e68c5441218a2ffeb2094b8251d31369837b (patch) | |
tree | 69608c869c3823df4f417d9df34866f400045533 /OpenSim/Framework/Util.cs | |
parent | Repair x-query-string (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
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 96292ff..821f1a0 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -1346,6 +1346,11 @@ namespace OpenSim.Framework | |||
1346 | return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri; | 1346 | return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri; |
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | public static byte[] StringToBytes256(string str, params object[] args) | ||
1350 | { | ||
1351 | return StringToBytes256(string.Format(str, args)); | ||
1352 | } | ||
1353 | |||
1349 | public static byte[] StringToBytes256(string str) | 1354 | public static byte[] StringToBytes256(string str) |
1350 | { | 1355 | { |
1351 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } | 1356 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } |
@@ -1364,6 +1369,11 @@ namespace OpenSim.Framework | |||
1364 | return data; | 1369 | return data; |
1365 | } | 1370 | } |
1366 | 1371 | ||
1372 | public static byte[] StringToBytes1024(string str, params object[] args) | ||
1373 | { | ||
1374 | return StringToBytes1024(string.Format(str, args)); | ||
1375 | } | ||
1376 | |||
1367 | public static byte[] StringToBytes1024(string str) | 1377 | public static byte[] StringToBytes1024(string str) |
1368 | { | 1378 | { |
1369 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } | 1379 | if (String.IsNullOrEmpty(str)) { return Utils.EmptyBytes; } |