Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluh

Browse Source
This commit is contained in:
CharleyLevenque
2010-09-08 20:04:35 -04:00
parent 60f056721c
commit 52612780a6
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/ascentfloatercontactgroups.cpp
View File

@@ -110,7 +110,7 @@ void ASFloaterContactGroups::populateGroupList()
{ {
LLChat msg("Found: " + name); LLChat msg("Found: " + name);
LLFloaterChat::addChat(msg); LLFloaterChat::addChat(msg);
scroller->addSimpleElement(name, ADD_BOTTOM); scroller->addSimpleElement(name.substr(0, -4), ADD_BOTTOM);
} }
else else
{ {

9
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -763,10 +763,11 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE); if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE);
if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE); if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE);
LLNameEditor* key_edit = getChild<LLNameEditor>("group_key");
if(key_edit)
{
key_edit->setText(gdatap->getID().asString());
}
if (mInsignia) if (mInsignia)
{ {

7
indra/newview/llviewermenu.cpp
View File

@@ -417,7 +417,7 @@ void handle_leave_god_mode(void*);
// <edit> // <edit>
void handle_fake_away_status(void*); void handle_fake_away_status(void*);
void handle_area_search(void*);
void handle_pose_stand_ltao(void*); void handle_pose_stand_ltao(void*);
void handle_pose_stand_ltah(void*); void handle_pose_stand_ltah(void*);
void handle_pose_stand_ltad(void*); void handle_pose_stand_ltad(void*);
@@ -748,6 +748,7 @@ void init_menus()
LLMenuGL*menu; LLMenuGL*menu;
menu = new LLMenuGL("Ascent"); menu = new LLMenuGL("Ascent");
menu->append(new LLMenuItemCallGL( "Object Area Search", &handle_area_search, NULL));
menu->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL)); menu->append(new LLMenuItemCallGL( "Fake Away Status", &handle_fake_away_status, NULL));
menu->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL)); menu->append(new LLMenuItemCallGL( "Force Ground Sit", &handle_force_ground_sit, NULL));
menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL)); menu->append(new LLMenuItemCallGL( "Phantom Avatar", &handle_phantom_avatar, NULL));
@@ -3479,6 +3480,10 @@ void handle_pose_stand_stop(void*)
} }
} }
// </dogmode> --------------------------------------------------- // </dogmode> ---------------------------------------------------
void handle_area_search(void*)
{
JCFloaterAreaSearch::toggle();
}
void handle_fake_away_status(void*) void handle_fake_away_status(void*)
{ {

4
indra/newview/skins/default/xui/en-us/panel_friends.xml
View File

@@ -45,9 +45,9 @@
<column name="friend_last_update_generation" width="0" /> <column name="friend_last_update_generation" width="0" />
</scroll_list> </scroll_list>
<pad bottom="-7" height="0" left="-90" width="1" /> <pad bottom="-7" height="0" left="-90" width="1" />
<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" <!--<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group" left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
width="80" /> width="80" />-->
<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
left_delta="0" name="im_btn" tool_tip="Open Instant Message session" left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
width="80" /> width="80" />