livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing re-defined variables, unused variables and other cruelties...

meow-7.2.2
Ansariel 2015-05-09 14:39:40 +02:00
parent 28ae84f967
commit 0cd0c588de
25 changed files with 139 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/NACLfloaterexploresounds.cpp
View File

@ -355,7 +355,6 @@ void NACLFloaterExploreSounds::handleStop()
std::vector<LLScrollListItem*> selection = mHistoryScroller->getAllSelected();
std::vector<LLScrollListItem*>::iterator selection_iter = selection.begin();
std::vector<LLScrollListItem*>::iterator selection_end = selection.end();
uuid_vec_t asset_list;
for( ; selection_iter != selection_end; ++selection_iter)
{
LLSoundHistoryItem item = getItem((*selection_iter)->getValue());
@ -391,7 +390,6 @@ void NACLFloaterExploreSounds::blacklistSound()
std::vector<LLScrollListItem*> selection = mHistoryScroller->getAllSelected();
std::vector<LLScrollListItem*>::iterator selection_iter = selection.begin();
std::vector<LLScrollListItem*>::iterator selection_end = selection.end();
uuid_vec_t asset_list;
for ( ; selection_iter != selection_end; ++selection_iter)
{

1
indra/newview/animationexplorer.cpp
View File

@ -38,7 +38,6 @@
#include "llcheckboxctrl.h"
#include "llfloater.h"
#include "llfloaterreg.h"
#include "llgl.h"
#include "llkeyframefallmotion.h"
#include "llrect.h"
#include "llscrolllistctrl.h"

203
indra/newview/exopostprocess.cpp
View File

@ -31,33 +31,32 @@ LLVector3 exoPostProcess::sExodusRenderVignette;
exoPostProcess::exoPostProcess()
{
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
mExoPostBuffer->allocateBuffer(8, 0, true);
LLStrider<LLVector3> vert;
mExoPostBuffer->getVertexStrider(vert);
LLStrider<LLVector2> tc0;
LLStrider<LLVector2> tc1;
mExoPostBuffer->getTexCoord0Strider(tc0);
mExoPostBuffer->getTexCoord1Strider(tc1);
vert[0].set(-1,1,0);
vert[1].set(-1,-3,0);
vert[2].set(3,1,0);
LLStrider<LLVector3> vert;
mExoPostBuffer->getVertexStrider(vert);
LLStrider<LLVector2> tc0;
LLStrider<LLVector2> tc1;
mExoPostBuffer->getTexCoord0Strider(tc0);
mExoPostBuffer->getTexCoord1Strider(tc1);
vert[0].set(-1.f, 1.f, 0.f);
vert[1].set(-1.f, -3.f, 0.f);
vert[2].set(3.f,1.f, 0.f);
sExodusRenderVignette = LLVector3(0.f, 0.f, 0.f);
}
exoPostProcess::~exoPostProcess()
{
mExoPostBuffer = NULL;
mExoPostBuffer = NULL;
}
void exoPostProcess::ExodusRenderPostStack(LLRenderTarget *src, LLRenderTarget *dst)
{
if (mVertexShaderLevel > 0)
{
{
if (sExodusRenderVignette.mV[0] > 0 && LLPipeline::sRenderDeferred)
ExodusRenderVignette(src, dst); // Don't render vignette here in non-deferred. Do it in the glow combine shader.
}
@ -69,115 +68,123 @@ void exoPostProcess::ExodusRenderPostSettingsUpdate()
}
void exoPostProcess::ExodusRenderPostUpdate()
{
etc1.setVec(0,0);
etc1.setVec(0.f, 0.f);
etc2.setVec((F32) gPipeline.mScreen.getWidth(),
(F32) gPipeline.mScreen.getHeight());
if (!gPipeline.sRenderDeferred)
{
// Destroy our old buffer, and create a new vertex buffer for the screen (shamelessly ganked from pipeline.cpp).
mExoPostBuffer = NULL;
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
(F32) gPipeline.mScreen.getHeight());
if (!gPipeline.sRenderDeferred)
{
// Destroy our old buffer, and create a new vertex buffer for the screen (shamelessly ganked from pipeline.cpp).
mExoPostBuffer = NULL;
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
mExoPostBuffer->allocateBuffer(3,0,TRUE);
LLStrider<LLVector3> v;
LLStrider<LLVector2> uv1;
LLStrider<LLVector2> uv2;
mExoPostBuffer->getVertexStrider(v);
mExoPostBuffer->getTexCoord0Strider(uv1);
mExoPostBuffer->getTexCoord1Strider(uv2);
uv1[0] = LLVector2(0, 0);
uv1[1] = LLVector2(0, 2);
uv1[2] = LLVector2(2, 0);
uv1[0] = LLVector2(0.f, 0.f);
uv1[1] = LLVector2(0.f, 2.f);
uv1[2] = LLVector2(2.f, 0.f);
uv2[0] = LLVector2(0, 0);
uv2[1] = LLVector2(0, etc2.mV[1]*2.f);
uv2[2] = LLVector2(etc2.mV[0]*2.f, 0);
uv2[0] = LLVector2(0.f, 0.f);
uv2[1] = LLVector2(0.f, etc2.mV[1] * 2.f);
uv2[2] = LLVector2(etc2.mV[0] * 2.f, 0.f);
v[0] = LLVector3(-1,-1,0);
v[1] = LLVector3(-1,3,0);
v[2] = LLVector3(3,-1,0);
v[0] = LLVector3(-1.f, -1.f, 0.f);
v[1] = LLVector3(-1.f, 3.f, 0.f);
v[2] = LLVector3(3.f, -1.f, 0.f);
mExoPostBuffer->flush();
} else {
mExoPostBuffer = NULL;
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
mExoPostBuffer->allocateBuffer(8, 0, true);
LLStrider<LLVector3> vert;
mExoPostBuffer->getVertexStrider(vert);
LLStrider<LLVector2> tc0;
LLStrider<LLVector2> tc1;
mExoPostBuffer->getTexCoord0Strider(tc0);
mExoPostBuffer->getTexCoord1Strider(tc1);
vert[0].set(-1,1,0);
vert[1].set(-1,-3,0);
vert[2].set(3,1,0);
}
}
else
{
mExoPostBuffer = NULL;
mExoPostBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1, 0);
mExoPostBuffer->allocateBuffer(8, 0, true);
LLStrider<LLVector3> vert;
mExoPostBuffer->getVertexStrider(vert);
LLStrider<LLVector2> tc0;
LLStrider<LLVector2> tc1;
mExoPostBuffer->getTexCoord0Strider(tc0);
mExoPostBuffer->getTexCoord1Strider(tc1);
vert[0].set(-1.f, 1.f, 0.f);
vert[1].set(-1.f, -3.f, 0.f);
vert[2].set(3.f, 1.f, 0.f);
}
}
void exoPostProcess::ExodusRenderPost(LLRenderTarget* src, LLRenderTarget* dst, S32 type)
{
if (type == EXODUS_RENDER_VIGNETTE_POST)
ExodusRenderVignette(src, dst);
if (type == EXODUS_RENDER_VIGNETTE_POST)
{
ExodusRenderVignette(src, dst);
}
}
void exoPostProcess::ExodusRenderVignette(LLRenderTarget* src, LLRenderTarget* dst)
{
dst->bindTarget();
LLGLSLShader *shader = &gVignettePost;
shader->bind();
mExoPostBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX);
exoShader::BindRenderTarget(dst, shader, LLShaderMgr::EXO_RENDER_SCREEN);
shader->uniform3fv(LLShaderMgr::EXO_RENDER_VIGNETTE, 1, sExodusRenderVignette.mV);
mExoPostBuffer->drawArrays(LLRender::TRIANGLES, 0, 3);
stop_glerror();
shader->unbind();
dst->flush();
dst->bindTarget();
LLGLSLShader *shader = &gVignettePost;
shader->bind();
mExoPostBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX);
exoShader::BindRenderTarget(dst, shader, LLShaderMgr::EXO_RENDER_SCREEN);
shader->uniform3fv(LLShaderMgr::EXO_RENDER_VIGNETTE, 1, sExodusRenderVignette.mV);
mExoPostBuffer->drawArrays(LLRender::TRIANGLES, 0, 3);
stop_glerror();
shader->unbind();
dst->flush();
}
void exoShader::BindTex2D(LLTexture *tex2D, LLGLSLShader *shader, S32 uniform, S32 unit, LLTexUnit::eTextureType mode, LLTexUnit::eTextureAddressMode addressMode, LLTexUnit::eTextureFilterOptions filterMode)
{
if(gPipeline.sRenderDeferred)
{
S32 channel = 0;
channel = shader->enableTexture(uniform);
if (channel > -1)
{
gGL.getTexUnit(channel)->bind(tex2D);
gGL.getTexUnit(channel)->setTextureFilteringOption(filterMode);
gGL.getTexUnit(channel)->setTextureAddressMode(addressMode);
}
} else {
gGL.getTexUnit(unit)->bind(tex2D);
}
if (gPipeline.sRenderDeferred)
{
S32 channel = 0;
channel = shader->enableTexture(uniform);
if (channel > -1)
{
gGL.getTexUnit(channel)->bind(tex2D);
gGL.getTexUnit(channel)->setTextureFilteringOption(filterMode);
gGL.getTexUnit(channel)->setTextureAddressMode(addressMode);
}
}
else
{
gGL.getTexUnit(unit)->bind(tex2D);
}
}
void exoShader::BindRenderTarget(LLRenderTarget* tgt, LLGLSLShader* shader, S32 uniform, S32 unit, LLTexUnit::eTextureType mode)
{
if(gPipeline.sRenderDeferred)
{
S32 channel = 0;
channel = shader->enableTexture(uniform, tgt->getUsage());
if (channel > -1)
{
tgt->bindTexture(0,channel);
gGL.getTexUnit(channel)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
}
} else {
S32 reftex = shader->enableTexture(uniform, tgt->getUsage());
if (reftex > -1)
{
gGL.getTexUnit(reftex)->activate();
gGL.getTexUnit(reftex)->bind(tgt);
gGL.getTexUnit(0)->activate();
}
}
shader->uniform2f(sScreen_Res, tgt->getWidth(), tgt->getHeight());
if (gPipeline.sRenderDeferred)
{
S32 channel = 0;
channel = shader->enableTexture(uniform, tgt->getUsage());
if (channel > -1)
{
tgt->bindTexture(0,channel);
gGL.getTexUnit(channel)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
}
}
else
{
S32 reftex = shader->enableTexture(uniform, tgt->getUsage());
if (reftex > -1)
{
gGL.getTexUnit(reftex)->activate();
gGL.getTexUnit(reftex)->bind(tgt);
gGL.getTexUnit(0)->activate();
}
}
shader->uniform2f(sScreen_Res, tgt->getWidth(), tgt->getHeight());
}

16
indra/newview/fsfloatersearch.cpp
View File

@ -34,7 +34,6 @@
#include "llagent.h"
#include "llavatarname.h"
#include "llavatarnamecache.h"
#include "llcallingcard.h"
#include "llclassifiedflags.h"
#include "llclassifiedstatsresponder.h"
#include "lldateutil.h"
@ -49,7 +48,6 @@
#include "llproductinforequest.h"
#include "lllogininstance.h"
#include "llviewercontrol.h"
#include "llviewerfloaterreg.h"
#include "llviewergenericmessage.h"
#include "llviewernetwork.h"
#include "llviewerregion.h"
@ -68,11 +66,8 @@
#include "llfloaterworldmap.h"
#include "fspanelclassified.h"
#include "fspanelprofile.h"
#include "fspanelprofileclassifieds.h"
#include <iostream>
#include <string>
#include <boost/foreach.hpp>
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
@ -858,8 +853,6 @@ void FSPanelSearchPeople::processSearchReply(LLMessageSystem* msg, void**)
std::string first_name;
std::string last_name;
LLUUID agent_id;
LLUUID avatar_id;
//U8 online;
msg->getUUIDFast(_PREHASH_QueryData, _PREHASH_QueryID, query_id);
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
@ -1560,8 +1553,6 @@ void FSPanelSearchPlaces::processSearchReply(LLMessageSystem* msg, void**)
search_results->setEnabled(TRUE);
found_one = TRUE;
std::string place_name;
LLSD content;
LLSD element;
@ -1931,9 +1922,9 @@ void FSPanelSearchLand::processSearchReply(LLMessageSystem* msg, void**)
ppm = (F32)price / (F32)area;
else
ppm = 0.f;
std::string buffer = llformat("%.1f", ppm);
std::string ppm_buffer = llformat("%.1f", ppm);
element["columns"][4]["column"] = "ppm";
element["columns"][4]["value"] = buffer;
element["columns"][4]["value"] = ppm_buffer;
}
else
{
@ -2234,8 +2225,6 @@ void FSPanelSearchClassifieds::processSearchReply(LLMessageSystem* msg, void**)
search_results->setEnabled(TRUE);
found_one = TRUE;
std::string classified_name;
LLSD content;
LLSD element;
@ -2634,7 +2623,6 @@ void FSPanelSearchEvents::processSearchReply(LLMessageSystem* msg, void**)
search_results->setEnabled(TRUE);
found_one = TRUE;
std::string event_name;
LLSD content;
LLSD element;

3
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -39,7 +39,6 @@
#include "llavatarnamecache.h"
#include "llavatariconctrl.h"
#include "llavatarlist.h"
#include "lldraghandle.h"
#include "fsfloaterim.h"
#include "llimview.h"
#include "llfloaterreg.h"
@ -636,8 +635,6 @@ void FSFloaterVoiceControls::initParticipantsVoiceState()
void FSFloaterVoiceControls::updateParticipantsVoiceState()
{
uuid_vec_t speakers_list;
// Get a list of participants from VoiceClient
uuid_vec_t speakers_uuids;
get_voice_participants_uuids(speakers_uuids);

48
indra/newview/fsfloatervolumecontrols.cpp
View File

@ -30,23 +30,14 @@
#include "fsfloatervolumecontrols.h"
#include "llcheckboxctrl.h"
#include "llfloaterreg.h"
#include "llpanel.h"
#include "lltabcontainer.h"
#include "llfloaterpreference.h"
#include "utilitybar.h"
#include "llviewercontrol.h"
FSFloaterVolumeControls::FSFloaterVolumeControls(const LLSD& key)
: LLFloater(key)
{
//<FS:KC> Handled centrally now
/*
mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&FSFloaterVolumeControls::onAudioPrefsButtonClicked, this));
mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&FSFloaterVolumeControls::setControlFalse, this, _2));
mCommitCallbackRegistrar.add("Vol.SetSounds", boost::bind(&FSFloaterVolumeControls::setSounds, this));
*/
}
FSFloaterVolumeControls::~FSFloaterVolumeControls()
@ -70,42 +61,3 @@ void FSFloaterVolumeControls::onVisibilityChange(BOOL new_visibility)
UtilityBar::instance().setVolumeControlsButtonExpanded(new_visibility);
LLFloater::onVisibilityChange(new_visibility);
}
//<FS:KC> Handled centrally now
/*
void FSFloaterVolumeControls::onAudioPrefsButtonClicked()
{
// bring up the prefs floater
LLFloaterPreference* prefsfloater = LLFloaterReg::showTypedInstance<LLFloaterPreference>("preferences");
if (prefsfloater)
{
// grab the 'audio' panel from the preferences floater and
// bring it the front!
LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio");
if (tabcontainer && audiopanel)
{
tabcontainer->selectTabPanel(audiopanel);
}
}
}
void FSFloaterVolumeControls::setControlFalse(const LLSD& user_data)
{
std::string control_name = user_data.asString();
LLControlVariable* control = findControl(control_name);
if (control)
{
control->set(LLSD(FALSE));
}
}
void FSFloaterVolumeControls::setSounds()
{
// Disable Enable gesture/collisions sounds checkbox if the master sound is disabled
// or if sound effects are disabled.
getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
getChild<LLCheckBoxCtrl>("collisions_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
}
*/

5
indra/newview/fsfloatervolumecontrols.h
View File

@ -41,11 +41,6 @@ private:
~FSFloaterVolumeControls();
/*virtual*/ void onVisibilityChange(BOOL new_visibility);
/*//<FS:KC> Handled centrally now
void onAudioPrefsButtonClicked();
void setControlFalse(const LLSD& user_data);
void setSounds();
*/
};
#endif // FS_FLOATERVOLUMECONTROLS_H

1
indra/newview/fsfloatervramusage.cpp
View File

@ -30,7 +30,6 @@
#include "lldrawable.h"
#include "llviewertexture.h"
#include "lltoolpie.h"
#include "llfloaterreg.h"
#include "llface.h"
#include "llvertexbuffer.h"
#include "llcallbacklist.h"

5
indra/newview/fsfloaterwsassetblacklist.cpp
View File

@ -54,19 +54,14 @@ std::string FSFloaterWSAssetBlacklist::getTypeString(S32 type)
{
case 0:
return getString("asset_texture");
break;
case 1:
return getString("asset_sound");
break;
case 6:
return getString("asset_object");
break;
case 45:
return getString("asset_resident");
break;
default:
return getString("asset_unknown");
break;
}
}

2
indra/newview/fslightshare.cpp
View File

@ -73,7 +73,7 @@ void FSLightshare::processLightshareMessage(LLMessageSystem* msg)
S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
for (S32 i = 0; i < count; ++i)
{
S32 size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
if (size >= 0)
{
char buffer[250];

27
indra/newview/fslslbridge.cpp
View File

@ -31,7 +31,6 @@
#include "fslslbridge.h"
#include "fslslbridgerequest.h"
#include "aoengine.h"
#include "apr_base64.h" // For getScriptInfo()
#include "llagent.h"
#include "llattachmentsmgr.h"
@ -167,7 +166,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID,
// If something that looks like our current bridge is attached but failed auth, detach and recreate.
LLUUID catID = findFSCategory();
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID, LLAssetType::AT_OBJECT);
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID);
if (fsBridge && get_is_item_worn(fsBridge->getUUID()))
{
mAllowDetach = true;
@ -202,10 +201,10 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID,
mCurrentURL = bURL;
LL_INFOS("FSLSLBridge") << "New Bridge URL is: " << mCurrentURL << LL_ENDL;
if (mpBridge == NULL)
if (!mpBridge)
{
LLUUID catID = findFSCategory();
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID, LLAssetType::AT_OBJECT);
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID);
mpBridge = fsBridge;
}
@ -643,7 +642,7 @@ void FSLSLBridge::startCreation()
//if bridge object doesn't exist - create and attach it, update script.
LLUUID catID = findFSCategory();
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID, LLAssetType::AT_OBJECT);
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID);
//detach everything else
LL_INFOS("FSLSLBridge") << "Detaching other bridges..." << LL_ENDL;
@ -693,7 +692,7 @@ void FSLSLBridge::createNewBridge()
//attach the Linden rock from the library (will resize as soon as attached)
LLUUID libID = gInventory.getLibraryRootFolderID();
LLViewerInventoryItem* libRock = findInvObject(LIB_ROCK_NAME, libID, LLAssetType::AT_OBJECT);
LLViewerInventoryItem* libRock = findInvObject(LIB_ROCK_NAME, libID);
//shouldn't happen but just in case
if (libRock != NULL)
{
@ -900,7 +899,7 @@ void FSLSLBridge::configureBridgePrim(LLViewerObject* object)
//add bridge script to object
LL_INFOS("FSLSLBridge") << "Creating bridge script..." << LL_ENDL;
create_script_inner(object);
create_script_inner();
}
void FSLSLBridge::processDetach(LLViewerObject* object, const LLViewerJointAttachment* attachment)
@ -1033,7 +1032,7 @@ void FSLSLBridge::setupBridgePrim(LLViewerObject* object)
LL_DEBUGS("FSLSLBridge") << "End bridge container setup." << LL_ENDL;
}
void FSLSLBridge::create_script_inner(LLViewerObject* object)
void FSLSLBridge::create_script_inner()
{
if (!isBridgeValid())
{
@ -1430,7 +1429,7 @@ LLUUID FSLSLBridge::findFSBridgeContainerCategory()
return LLUUID();
}
LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type)
LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, const LLUUID& catID)
{
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
@ -1518,8 +1517,8 @@ void FSLSLBridge::cleanUpOldVersions()
}
}
bool FSLSLBridge::isOldBridgeVersion(LLInventoryItem* item)
{
//bool FSLSLBridge::isOldBridgeVersion(LLInventoryItem* item)
//{
//if (!item)
// return false;
////if (!boost::regex_match(item->getName(), FSBridgePattern))
@ -1540,8 +1539,8 @@ bool FSLSLBridge::isOldBridgeVersion(LLInventoryItem* item)
////int iMajor = atoi(sMajor);
////float fMinor = atof(sMinor);
return false;
}
// return false;
//}
void FSLSLBridge::detachOtherBridges()
{
@ -1549,7 +1548,7 @@ void FSLSLBridge::detachOtherBridges()
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID, LLAssetType::AT_OBJECT);
LLViewerInventoryItem* fsBridge = findInvObject(mCurrentFullName, catID);
//detach everything except current valid bridge - if any
gInventory.collectDescendents(catID,cats,items,FALSE);

6
indra/newview/fslslbridge.h
View File

@ -111,14 +111,14 @@ private:
uuid_vec_t mAllowedDetachables;
protected:
LLViewerInventoryItem* findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type);
LLViewerInventoryItem* findInvObject(const std::string& obj_name, const LLUUID& catID);
LLUUID findFSCategory();
LLUUID findFSBridgeContainerCategory();
bool isItemAttached(const LLUUID& iID);
void createNewBridge();
void create_script_inner(LLViewerObject* object);
bool isOldBridgeVersion(LLInventoryItem* item);
void create_script_inner();
//bool isOldBridgeVersion(LLInventoryItem* item);
void cleanUpBridgeFolder();
void cleanUpBridgeFolder(const std::string& nameToCleanUp);
void setupBridgePrim(LLViewerObject* object);

2
indra/newview/fsmoneytracker.cpp
View File

@ -32,7 +32,6 @@
#include "llclipboard.h"
#include "llfloaterreg.h"
#include "llnamelistctrl.h"
#include "llslurl.h"
#include "lltrans.h"
#include "llviewercontrol.h"
@ -151,7 +150,6 @@ void FSMoneyTrackerListMenu::onContextMenuItemClick(const LLSD& userdata)
FSMoneyTracker* floater = LLFloaterReg::findTypedInstance<FSMoneyTracker>("money_tracker");
if (floater)
{
std::string copy_text;
LLNameListCtrl* list = floater->getChild<LLNameListCtrl>("payment_list");
list->operateOnSelection(LLCtrlListInterface::OP_DELETE);

2
indra/newview/fsnamelistavatarmenu.cpp
View File

@ -35,9 +35,7 @@
#include "lllogchat.h"
#include "llmenugl.h"
#include "llslurl.h"
#include "lluictrlfactory.h"
#include "llurlaction.h"
#include "llviewercontrol.h"
#include "rlvactions.h"
FSNameListAvatarMenu gFSNameListAvatarMenu;

4
indra/newview/fsnearbychatcontrol.cpp
View File

@ -29,7 +29,6 @@
// llui
#include "lllineeditor.h"
#include "llmenugl.h"
#include "llspinctrl.h"
// newview
@ -39,14 +38,11 @@
#include "llagent.h" // gAgent
#include "llagentcamera.h" // gAgentCamera
#include "llfloaterimnearbychathandler.h"
#include "llviewermenu.h" //for gMenuHolder
//AO - includes for textentry
#include "llautoreplace.h"
#include "llcommandhandler.h"
#include "llgesturemgr.h"
#include "llkeyboard.h"
#include "llmultigesture.h"
#include "llworld.h" // <FS:CR> FIRE-3192 - Name Prediction
#include "rlvhandler.h"

39
indra/newview/fsnearbychathub.cpp
View File

@ -28,38 +28,19 @@
#include "llviewerprecompiledheaders.h"
#include "fsnearbychathub.h"
#include "fsnearbychatcontrol.h"
#include "fsfloaternearbychat.h"
#include "llviewercontrol.h"
#include "llviewerwindow.h"
#include "llrootview.h"
#include "llspinctrl.h"
#include "llfocusmgr.h"
#include "lllogchat.h"
#include "llmenugl.h"
#include "llviewermenu.h"//for gMenuHolder
#include "llfloaterimnearbychathandler.h"
#include "llchannelmanager.h"
#include "llagent.h" // gAgent
//AO - includes for textentry
#include "rlvhandler.h"
#include "llcommandhandler.h"
#include "llkeyboard.h"
#include "llgesturemgr.h"
#include "llmultigesture.h"
#include "llconsole.h"
// <FS:Zi> Moved nearby chat functionality here
#include "chatbar_as_cmdline.h"
#include "llanimationstates.h" // ANIM_AGENT_WHISPER, ANIM_AGENT_TALK, ANIM_AGENT_SHOUT
#include "llviewerstats.h"
// </FS:Zi>
#include "fscommon.h"
#include "fsfloaternearbychat.h"
#include "fsnearbychatcontrol.h"
#include "llagent.h" // gAgent
#include "llanimationstates.h" // ANIM_AGENT_WHISPER, ANIM_AGENT_TALK, ANIM_AGENT_SHOUT
#include "llcommandhandler.h"
#include "llgesturemgr.h"
#include "llspinctrl.h"
#include "llviewercontrol.h"
#include "llviewerstats.h"
#include "rlvhandler.h"
// <FS:KC> Fix for bad edge snapping
// *HACK* chat bar cannot return its correct height for some reason

1
indra/newview/fspanelclassified.cpp
View File

@ -42,7 +42,6 @@
#include "llagent.h"
#include "llclassifiedflags.h"
#include "llclassifiedstatsresponder.h"
#include "llcommandhandler.h" // for classified HTML detail page click tracking
#include "lliconctrl.h"
#include "lllineeditor.h"
#include "llcombobox.h"

1
indra/newview/fsradarentry.cpp
View File

@ -28,7 +28,6 @@
#include "fsradarentry.h"
#include <boost/algorithm/string.hpp>
#include "fscommon.h"
#include "fsradar.h"
#include "llagent.h"

3
indra/newview/fsradarmenu.cpp
View File

@ -29,14 +29,11 @@
// libs
#include "llmenugl.h"
#include "lluictrlfactory.h"
#include "fsradarmenu.h"
// newview
#include "fsradar.h"
#include "llagent.h"
#include "llagentdata.h" // for gAgentID
#include "llavataractions.h"
#include "llcallingcard.h" // for LLAvatarTracker
#include "llnetmap.h"

2
indra/newview/fsslurlcommand.cpp
View File

@ -27,8 +27,6 @@
#include "llviewerprecompiledheaders.h"
#include "fsslurlcommand.h"
#include "fscommon.h"
#include "fsradar.h"
#include "llagent.h"
#include "llavataractions.h"
#include "llcommandhandler.h"

7
indra/newview/particleeditor.cpp
View File

@ -22,14 +22,12 @@
#include "llviewerprecompiledheaders.h"
#include "particleeditor.h"
#include <iostream>
#include <fstream>
#include "llagent.h"
#include "llappviewer.h"
#include "llassetuploadresponders.h"
#include "llcheckboxctrl.h"
#include "llclipboard.h"
#include "llcolorswatch.h"
#include "llcombobox.h"
#include "lldir.h"
@ -40,7 +38,6 @@
#include "lllineeditor.h"
#include "llnotificationsutil.h"
#include "llpermissions.h"
#include "llpreviewscript.h"
#include "llsd.h"
#include "llspinctrl.h"
#include "lltexturectrl.h"
@ -647,7 +644,7 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
}
}
void ParticleEditor::scriptInjectReturned(const LLSD& content)
void ParticleEditor::scriptInjectReturned()
{
setCanClose(TRUE);
@ -702,6 +699,6 @@ void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
LLUpdateAgentInventoryResponder::uploadComplete(content);
if (!gDisconnected && !LLAppViewer::instance()->quitRequested() && mEditor)
{
mEditor->scriptInjectReturned(content);
mEditor->scriptInjectReturned();
}
}

2
indra/newview/particleeditor.h
View File

@ -70,7 +70,7 @@ class ParticleEditor : public LLFloater
static void onTargetPicked(void* userdata);
void callbackReturned(const LLUUID& inv_item);
void scriptInjectReturned(const LLSD& content);
void scriptInjectReturned();
std::string lslVector(F32 x, F32 y, F32 z);
std::string lslColor(const LLColor4& color);

6
indra/newview/qtoolalign.cpp
View File

@ -9,7 +9,6 @@
#include "qtoolalign.h"
// Library includes
#include "llfloaterreg.h"
#include "llbbox.h"
#include "v3math.h"
@ -21,15 +20,14 @@
#include "llselectmgr.h"
#include "lltrans.h"
#include "llviewercamera.h"
#include "llviewercontrol.h"
#include "llviewerobject.h"
#include "llviewerwindow.h"
#include "lleventtimer.h"
#include "fscommon.h"
const F32 MANIPULATOR_SIZE = 5.0;
const F32 MANIPULATOR_SELECT_SIZE = 20.0;
const F32 MANIPULATOR_SIZE = 5.0f;
const F32 MANIPULATOR_SELECT_SIZE = 20.0f;

3
indra/newview/quickprefs.cpp
View File

@ -39,7 +39,6 @@
#include "llcombobox.h"
#include "llcubemap.h"
#include "lldaycyclemanager.h"
#include "lldrawpoolbump.h"
#include "llenvmanager.h"
#include "llf32uictrl.h"
#include "llfeaturemanager.h"
@ -49,10 +48,8 @@
#include "llnotificationsutil.h"
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "lltimectrl.h"
#include "lltoolbarview.h"
#include "llviewercontrol.h"
#include "llviewertexturelist.h"
#include "llwaterparammanager.h"
#include "llwlparamset.h"
#include "llwlparammanager.h"

3
indra/newview/utilitybar.cpp
View File

@ -27,9 +27,6 @@
#include "utilitybar.h"
#include "llbutton.h"
#include "llfloaterreg.h"
#include "llpanel.h"
#include "lltabcontainer.h"
#include "llagent.h"
#include "llstatusbar.h"