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

Removed some TOS/TPVp violations that we missed in the last sweep

Browse Source 
Fix for the client definitions - Emerald's color is corrected, Emergence now reports properly.
Fixed the error "Client crashes if preferences is opened on login screen"

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-04 16:18:24 -04:00
parent dcf46b5c47
commit a104e23fdb
10 changed files with 1026 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -11,5 +11,6 @@
*.rej
*.bak
*~
+/LICENSES
/edited-files.txt
qtcreator-build/

14
indra/newview/app_settings/client_definitions.xml
View File

@@ -150,7 +150,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>1</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -164,7 +164,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -178,7 +178,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -192,7 +192,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>1</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -206,7 +206,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -234,7 +234,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>0</real>
<real>2</real>
<key>name</key>
<string>Emerald</string>
</map>
@@ -262,7 +262,7 @@
<real>1</real>
</array>
<key>multiple</key>
<real>2</real>
<real>0</real>
<key>name</key>
<string>Emergence</string>
</map>

12
indra/newview/ascentprefssys.cpp
View File

@@ -106,6 +106,8 @@ LLPrefsAscentSysImpl::LLPrefsAscentSysImpl()
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
childSetCommitCallback("enable_clouds", onCommitCheckBox, this);
mEnableClouds = gSavedSettings.getBOOL("CloudsEnabled");
refreshValues();
refresh();
}
@@ -164,7 +166,11 @@ void LLPrefsAscentSysImpl::refreshValues()
//Performance -------------------------------------------------------------------------
mFetchInventoryOnLogin = gSavedSettings.getBOOL("FetchInventoryOnLogin");
mEnableLLWind = gSavedSettings.getBOOL("WindEnabled");
mEnableClouds = gSavedSettings.getBOOL("CloudsEnabled");
if(mEnableClouds != gSavedSettings.getBOOL("CloudsEnabled"))
{
mEnableClouds = gSavedSettings.getBOOL("CloudsEnabled");
LLPipeline::toggleRenderTypeControl((void*)LLPipeline::RENDER_TYPE_CLOUDS);
}
mSpeedRez = gSavedSettings.getBOOL("SpeedRez");
mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval");
@@ -246,6 +252,7 @@ void LLPrefsAscentSysImpl::refresh()
childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
childSetValue("enable_wind", mEnableLLWind);
childSetValue("enable_clouds", mEnableClouds);
gLLWindEnabled = mEnableLLWind;
childSetValue("speed_rez_check", mSpeedRez);
if (mSpeedRez)
{
@@ -315,6 +322,7 @@ void LLPrefsAscentSysImpl::cancel()
gSavedSettings.setBOOL("CloudsEnabled", mEnableClouds);
LLPipeline::toggleRenderTypeControl((void*)LLPipeline::RENDER_TYPE_CLOUDS);
}
gLLWindEnabled = mEnableLLWind;
}
void LLPrefsAscentSysImpl::apply()
@@ -398,7 +406,7 @@ void LLPrefsAscentSysImpl::apply()
//Performance ----------------------------------------------------------------------------
gSavedSettings.setBOOL("FetchInventoryOnLogin", childGetValue("fetch_inventory_on_login_check"));
gSavedSettings.setBOOL("WindEnabled", childGetValue("enable_wind"));
//Missing "Enabled Clouds"
gSavedSettings.setBOOL("CloudsEnabled", childGetValue("enable_clouds"));
gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval").asReal());

3
indra/newview/ascentprefsvan.cpp
View File

@@ -148,7 +148,8 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
self->childSetEnabled("custom_tag_label_box", showCustomOptions);
self->childSetEnabled("custom_tag_color_text", showCustomOptions);
self->childSetEnabled("custom_tag_color_swatch", showCustomOptions);
gAgent.resetClientTag();
if (!gAgent.getID().isNull())
gAgent.resetClientTag();
}
void LLPrefsAscentVanImpl::refreshValues()

7
indra/newview/llagent.cpp
View File

@@ -827,8 +827,11 @@ BOOL LLAgent::getPhantom()
void LLAgent::resetClientTag()
{
llinfos << "Resetting mClientTag." << llendl;
mAvatarObject->mClientTag = "";
if (!mAvatarObject.isNull())
{
llinfos << "Resetting mClientTag." << llendl;
mAvatarObject->mClientTag = "";
}
}
//

13
indra/newview/llpanelface.cpp
View File

@@ -383,15 +383,10 @@ void LLPanelFace::getState()
if( objectp
&& objectp->getPCode() == LL_PCODE_VOLUME
// <edit>
//&& objectp->permModify())
)
// </edit>
{
// <edit>
//BOOL editable = objectp->permModify();
BOOL editable = TRUE;
// </edit>
&& objectp->permModify())
{
BOOL editable = objectp->permModify();
// only turn on auto-adjust button if there is a media renderer and the media is loaded
childSetEnabled("textbox autofix",FALSE);

52
indra/newview/lltexturectrl.cpp
View File

@@ -309,7 +309,6 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
mNoCopyTextureSelected = FALSE;
mIsDirty = TRUE;
mImageAssetID = image_id;
/* I'm good, thanks
LLUUID item_id = findItemID(mImageAssetID, FALSE);
if (item_id.isNull())
{
@@ -327,7 +326,6 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
}
mInventoryPanel->setSelection(item_id, TAKE_FOCUS_NO);
}
*/
}
}
@@ -1281,43 +1279,6 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
return handled;
}
// <edit>
//static
void LLTextureCtrl::handleClickOpenTexture(void* userdata)
{
LLTextureCtrl* clickedTexture = static_cast<LLTextureCtrl*>(userdata);
if(clickedTexture)
LLLocalInventory::addItem(clickedTexture->mImageAssetID.asString(), (int)LLAssetType::AT_TEXTURE, clickedTexture->mImageAssetID, true);
}
//static
void LLTextureCtrl::handleClickCopyAssetID(void* userdata)
{
LLTextureCtrl* clickedTexture = static_cast<LLTextureCtrl*>(userdata);
if(clickedTexture)
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(clickedTexture->mImageAssetID.asString()));
}
BOOL LLTextureCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown( x, y , mask );
if( handled )
{
LLMenuGL* menu = new LLMenuGL(LLStringUtil::null);
menu->append(new LLMenuItemCallGL("Open", LLTextureCtrl::handleClickOpenTexture, NULL, this));
menu->append(new LLMenuItemCallGL("Copy Asset UUID", LLTextureCtrl::handleClickCopyAssetID, NULL, this));
menu->updateParent(LLMenuGL::sMenuContainer);
menu->setCanTearOff(FALSE);
LLMenuGL::showPopup(this, menu, x, y);
}
return handled;
}
// </edit>
void LLTextureCtrl::onFloaterClose()
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
@@ -1504,10 +1465,9 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
// PermissionMask filter_perm_mask = mCanApplyImmediately ? commented out due to no-copy texture loss.
// mImmediateFilterPermMask : mNonImmediateFilterPermMask;
// <edit>
//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
// </edit>
PermissionMask filter_perm_mask = mImmediateFilterPermMask;
if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
{
if(mDragCallback)
{
@@ -1518,12 +1478,10 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
return TRUE;
}
}
// <edit>
/*else
{
return FALSE;
}*/
// </edit>
}
}
BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)

4
indra/newview/lltexturectrl.h
View File

@@ -79,9 +79,7 @@ public:
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
// <edit>
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
// </edit>
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
EAcceptance *accept,

2006
indra/newview/lltoolpie.cpp
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/llvoavatar.cpp
View File

@@ -1659,8 +1659,6 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
//-----------------------------------------------------------------------------
void LLVOAvatar::renderCollisionVolumes()
{
//BLATANTLY STOLEN FROM SIMMAN DURRR
LLGLDepthTest gls_depth(GL_FALSE); //make it so the skeleton shows through the mesh and prims (good for milfags)
for (S32 i = 0; i < mNumCollisionVolumes; i++)
{
mCollisionVolumes[i].renderCollision();