aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/floaterbusy.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-13 02:59:46 -0700
committerMcCabe Maxsted2010-04-13 02:59:46 -0700
commitdeda3832abc642ffbfc0bfd00520a82ad402b884 (patch)
treeb8c26bb9ee4b6da47bdde22012e00392db0a15bb /linden/indra/newview/floaterbusy.cpp
parentPorted Emerald build preferences and added them to llfloaterbuildoptions instead (diff)
downloadmeta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.zip
meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.gz
meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.bz2
meta-impy-deda3832abc642ffbfc0bfd00520a82ad402b884.tar.xz
Save custom prim defaults on a per-account basis rather than globally
Diffstat (limited to 'linden/indra/newview/floaterbusy.cpp')
-rw-r--r--linden/indra/newview/floaterbusy.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/linden/indra/newview/floaterbusy.cpp b/linden/indra/newview/floaterbusy.cpp
index 5823dfa..9188ae1 100644
--- a/linden/indra/newview/floaterbusy.cpp
+++ b/linden/indra/newview/floaterbusy.cpp
@@ -147,27 +147,10 @@ BOOL FloaterBusy::postBuild()
147 { 147 {
148 childSetValue("im_give_disp_rect_txt","Currently set to a item not on this account"); 148 childSetValue("im_give_disp_rect_txt","Currently set to a item not on this account");
149 } 149 }
150
151 itemid = (LLUUID)gSavedSettings.getString("EmeraldBuildPrefs_Item");
152 item = gInventory.getItem(itemid);
153
154 if (item)
155 {
156 childSetValue("build_item_add_disp_rect_txt","Currently set to: "+item->getName());
157 }
158 else if (itemid.isNull())
159 {
160 childSetValue("build_item_add_disp_rect_txt","Currently not set");
161 }
162 else
163 {
164 childSetValue("build_item_add_disp_rect_txt","Currently set to a item not on this account");
165 }
166 } 150 }
167 else 151 else
168 { 152 {
169 childSetValue("im_give_disp_rect_txt","Not logged in"); 153 childSetValue("im_give_disp_rect_txt","Not logged in");
170 childSetValue("build_item_add_disp_rect_txt","Not logged in");
171 } 154 }
172 155
173 LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("InstantMessageResponse") ); 156 LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("InstantMessageResponse") );