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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
Beeks
2010-09-16 16:02:28 -04:00
parent 59d7c33954 e5afa9b50f
commit 7f0af74e00
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/CMakeLists.txt
View File

@@ -104,7 +104,7 @@ if (VIEWER)
endif (LINUX) endif (LINUX)
add_subdirectory(${VIEWER_PREFIX}newview) add_subdirectory(${VIEWER_PREFIX}newview)
add_dependencies(viewer secondlife-bin) add_dependencies(viewer Ascent)
endif (VIEWER) endif (VIEWER)
# Linux builds the viewer and server in 2 separate projects # Linux builds the viewer and server in 2 separate projects

4
indra/newview/llfloaterfriends.cpp
View File

@@ -240,8 +240,8 @@ void LLPanelFriends::populateContactGroupSelect()
if ((name == ".") || (name == "..")) continue; if ((name == ".") || (name == "..")) continue;
combo->add(name, ADD_BOTTOM); combo->add(name, ADD_BOTTOM);
LLChat msg("Combo Add " + name); //LLChat msg("Combo Add " + name);
LLFloaterChat::addChat(msg); //LLFloaterChat::addChat(msg);
} }
} }
} }

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

@@ -44,9 +44,9 @@
height="18" left="-235" name="buddy_search_lineedit" height="18" left="-235" name="buddy_search_lineedit"
tool_tip="The friend name you want to search for" width="130" /> tool_tip="The friend name you want to search for" width="130" />
<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" />