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

Git is saying I can't just pull the updates, so I'm forced to push this so I can sync. It's unfinished and shouldn't be used or touched really.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-08-29 14:39:59 -04:00
parent 998d985130
commit 98bd948613
7 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/CMakeLists.txt
View File

@@ -64,6 +64,7 @@ include_directories(
)
set(viewer_SOURCE_FILES
ascentuploadbrowser.cpp
dofloaterhex.cpp
dohexeditor.cpp
floatersculptpreview.cpp
@@ -508,7 +509,7 @@ endif (LINUX)
set(viewer_HEADER_FILES
CMakeLists.txt
ViewerInstall.cmake
ascentuploadbrowser.h
dofloaterhex.h
dohexeditor.h
floatersculptpreview.h

11
indra/newview/app_settings/settings.xml
View File

@@ -13523,7 +13523,7 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>FloaterDickDongsRect</key>
<key>FloaterUploadRect</key>
<map>
<key>Comment</key>
<string>Rectangle for DicksDongs</string>
@@ -13534,11 +13534,10 @@
<string>Rect</string>
<key>Value</key>
<array>
<integer>200</integer>
<integer>250</integer>
<integer>250</integer>
<integer>200</integer>
<integer>500</integer>
<integer>450</integer>
<integer>850</integer>
<integer>400</integer>
</array>
</map>
<key>FloaterHexRect</key>

2
indra/newview/llfloaterdickdongs.cpp
View File

@@ -44,7 +44,7 @@
//this is really the only thing that needs to be here atm
LLFloaterDickDongs::LLFloaterDickDongs(const LLSD& seed)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dickdongs.xml");
//LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dickdongs.xml");
}
//Not needed yet

6
indra/newview/llstartup.cpp
View File

@@ -2646,10 +2646,10 @@ bool idle_startup()
LLFloaterActiveSpeakers::showInstance();
}
if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
/*if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
{
LLFloaterBeacons::showInstance();
}
LLFloaterBeacons::showInstance(); DIE
}*/
if (!gSavedSettings.getBOOL("CloudsEnabled") && !gNoRender)
{

21
indra/newview/llviewermenu.cpp
View File

@@ -112,7 +112,8 @@
#include "llfloaterchat.h"
#include "llfloatercustomize.h"
#include "llfloaterdaycycle.h"
#include "llfloaterdickdongs.h"
//#include "llfloaterdickdongs.h" No need for the custom floater right now, I think. -HgB
#include "ascentuploadbrowser.h" //New customer floater attempts
#include "llfloaterdirectory.h"
#include "llfloatereditui.h"
#include "llfloaterchatterbox.h"
@@ -6062,17 +6063,17 @@ class LLShowFloater : public view_listener_t
{
LLFloaterActiveSpeakers::toggleInstance(LLSD());
}
else if (floater_name == "beacons")
/*else if (floater_name == "beacons")
{
LLFloaterBeacons::toggleInstance(LLSD());
}
LLFloaterBeacons::toggleInstance(LLSD()); NO
}*/
else if (floater_name == "perm prefs")
{
LLFloaterPerms::toggleInstance(LLSD());
}
else if (floater_name == "dickdongs")
else if (floater_name == "ascentuploadbrowser")
{
LLFloaterDickDongs::toggleInstance(LLSD());
ASFloaterUploadBrowser::show(NULL);
}
return true;
}
@@ -6129,14 +6130,14 @@ class LLFloaterVisible : public view_listener_t
{
new_value = LLFloaterActiveSpeakers::instanceVisible(LLSD());
}
else if (floater_name == "beacons")
/*else if (floater_name == "beacons")
{
new_value = LLFloaterBeacons::instanceVisible(LLSD());
new_value = LLFloaterBeacons::instanceVisible(LLSD()); Oh man fuck this floater so much.
}
else if (floater_name == "dickdongs")
{
new_value = LLFloaterDickDongs::instanceVisible(LLSD());
}
new_value = LLFloaterDickDongs::instanceVisible(LLSD()); Not needed any more.
}*/
else if (floater_name == "inventory")
{
LLInventoryView* iv = LLInventoryView::getActiveInventory();

2
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -537,7 +537,7 @@ Go to World menu > About Land or select another parcel to show its details.
column_padding="0" draw_border="true" draw_heading="true"
draw_stripes="true" enabled="true"
follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
multi_select="false" name="owner list" name_column_index="2" width="450">
multi_select="true" name="owner list" name_column_index="2" width="450">
<column name="type" label="Type" sort="online_status" width="24" />
<column name="online_status" width="-1" />
<column name="name" dynamicwidth="true" label="Name" />

5
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -73,6 +73,11 @@
mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
<on_click function="File.Quit" userdata="" />
</menu_item_call>
<!--<menu_item_check bottom="-384" enabled="true" height="19" label="Test" left="0"
mouse_opaque="true" name="ascentuploadbrowser" width="211">
<on_click function="ShowFloater" userdata="ascentuploadbrowser" />
<on_check function="FloaterVisible" userdata="ascentuploadbrowser" />
</menu_item_check>-->
</menu>
<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"