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

Final changes for first release!

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-26 02:26:48 -04:00
parent d1c4a0a491
commit 9c39ea00d8
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/CopyWinLibs.cmake
View File

@@ -314,7 +314,7 @@ if (MSVC80)
)
set(all_targets ${all_targets} ${out_targets})
set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/Ascent.exe.config)
add_custom_command(
OUTPUT ${debug_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
@@ -359,7 +359,7 @@ if (MSVC80)
)
set(all_targets ${all_targets} ${out_targets})
set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/Ascent.exe.config)
add_custom_command(
OUTPUT ${release_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}
@@ -372,7 +372,7 @@ if (MSVC80)
COMMENT "Creating release app config file"
)
set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Ascent.exe.config)
add_custom_command(
OUTPUT ${relwithdebinfo_appconfig_file}
COMMAND ${PYTHON_EXECUTABLE}

13
indra/newview/llinventorybridge.cpp
View File

@@ -96,6 +96,8 @@
#include "llfloateranimpreview.h" // for reuploads
#include "llfloaterimagepreview.h" // for reuploads
#include "llimportobject.h" // for disabling options during import
#include "llviewerparcelmgr.h" // FOR SEXING.
#include "llparcel.h" // WOAH, EVEN MORE SEX
//#include "llcheats.h"
#include "dofloaterhex.h"
#include "hgfloatertexteditor.h"
@@ -1030,6 +1032,17 @@ void LLItemBridge::restoreToWorld()
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
// Alway rez objects as land group if available.
if (gSavedSettings.getBOOL("AscentAlwaysRezInGroup"))
{
LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if(gAgent.isInGroup(parcel->getGroupID()))
msg->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
else if(gAgent.isInGroup(parcel->getOwnerID()))
msg->addUUIDFast(_PREHASH_GroupID, parcel->getOwnerID());
else msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
} else msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
msg->nextBlockFast(_PREHASH_InventoryData);
itemp->packMessage(msg);
msg->sendReliable(gAgent.getRegion()->getHost());

BIN
indra/newview/res/snowglobe_icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

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

@@ -6,7 +6,7 @@
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
top="-1" />
<string name="real_url">
http://explicitlanguage.org/ascent.php
http://ascent.balseraph.org/
</string>
<string name="forgot_password_url">
http://secondlife.com/account/request.php