diff options
author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llinventory/llpermissions.cpp | |
parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
download | meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2 meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz |
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llinventory/llpermissions.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp index 925b68f..8f9f73d 100644 --- a/linden/indra/llinventory/llpermissions.cpp +++ b/linden/indra/llinventory/llpermissions.cpp | |||
@@ -3,6 +3,8 @@ | |||
3 | * @author Phoenix | 3 | * @author Phoenix |
4 | * @brief Permissions for objects and inventory. | 4 | * @brief Permissions for objects and inventory. |
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | ||
7 | * | ||
6 | * Copyright (c) 2002-2007, Linden Research, Inc. | 8 | * Copyright (c) 2002-2007, Linden Research, Inc. |
7 | * | 9 | * |
8 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
@@ -25,6 +27,7 @@ | |||
25 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 27 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
26 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
27 | * COMPLETENESS OR PERFORMANCE. | 29 | * COMPLETENESS OR PERFORMANCE. |
30 | * $/LicenseInfo$ | ||
28 | */ | 31 | */ |
29 | 32 | ||
30 | #include "linden_common.h" | 33 | #include "linden_common.h" |
@@ -1140,6 +1143,12 @@ void mask_to_string(U32 mask, char* str) | |||
1140 | *str = '\0'; | 1143 | *str = '\0'; |
1141 | } | 1144 | } |
1142 | 1145 | ||
1146 | std::string mask_to_string(U32 mask) | ||
1147 | { | ||
1148 | char str[16]; | ||
1149 | mask_to_string(mask, str); | ||
1150 | return std::string(str); | ||
1151 | } | ||
1143 | 1152 | ||
1144 | ///---------------------------------------------------------------------------- | 1153 | ///---------------------------------------------------------------------------- |
1145 | /// exported functions | 1154 | /// exported functions |