aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterdirectory.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaterdirectory.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterdirectory.cpp')
-rw-r--r--linden/indra/newview/llfloaterdirectory.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index f1ee946..305a029 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -71,7 +71,7 @@ S32 LLFloaterDirectory::sNewSearchCount = 0; // debug
71 71
72 72
73LLFloaterDirectory::LLFloaterDirectory(const std::string& name) 73LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
74: LLFloater(name, "FloaterFindRect2", ""), 74: LLFloater(name, std::string("FloaterFindRect2"), LLStringUtil::null),
75 mMinimizing(false) 75 mMinimizing(false)
76{ 76{
77 sInstance = this; 77 sInstance = this;
@@ -249,7 +249,7 @@ void* LLFloaterDirectory::createGroupDetail(void* userdata)
249 self->mPanelGroupp = new LLPanelGroup("panel_group.xml", 249 self->mPanelGroupp = new LLPanelGroup("panel_group.xml",
250 "PanelGroup", 250 "PanelGroup",
251 gAgent.getGroupID()); 251 gAgent.getGroupID());
252 self->mPanelGroupp->setAllowEdit(FALSE); 252 self->mPanelGroupp->setAllowEdit(FALSE || gAgent.isGodlike()); // Gods can always edit panels
253 self->mPanelGroupp->setVisible(FALSE); 253 self->mPanelGroupp->setVisible(FALSE);
254 return self->mPanelGroupp; 254 return self->mPanelGroupp;
255} 255}
@@ -258,7 +258,7 @@ void* LLFloaterDirectory::createGroupDetail(void* userdata)
258void* LLFloaterDirectory::createGroupDetailHolder(void* userdata) 258void* LLFloaterDirectory::createGroupDetailHolder(void* userdata)
259{ 259{
260 LLFloaterDirectory *self = (LLFloaterDirectory*)userdata; 260 LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
261 self->mPanelGroupHolderp = new LLPanel("PanelGroupHolder"); 261 self->mPanelGroupHolderp = new LLPanel(std::string("PanelGroupHolder"));
262 self->mPanelGroupHolderp->setVisible(FALSE); 262 self->mPanelGroupHolderp->setVisible(FALSE);
263 return self->mPanelGroupHolderp; 263 return self->mPanelGroupHolderp;
264} 264}
@@ -389,7 +389,7 @@ void LLFloaterDirectory::toggleFind(void*)
389#endif 389#endif
390 if (!sInstance) 390 if (!sInstance)
391 { 391 {
392 LLString panel = gSavedSettings.getString("LastFindPanel"); 392 std::string panel = gSavedSettings.getString("LastFindPanel");
393 showPanel(panel); 393 showPanel(panel);
394 394
395 // HACK: force query for today's events 395 // HACK: force query for today's events