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

merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752

master
Tofu Linden 2010-09-02 11:27:52 +01:00
parent ae115d1a89 39e6447d98
commit 63f2ddf377
13 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/contributions.txt
View File

@ -185,6 +185,7 @@ Carjay McGinnis
Catherine Pfeffer
VWR-1282
VWR-8624
VWR-10854
Celierra Darling
VWR-1274
VWR-6975
@ -311,6 +312,7 @@ Iskar Ariantho
VWR-1223
VWR-11759
Jacek Antonelli
SNOW-388
VWR-165
VWR-188
VWR-427
@ -404,6 +406,7 @@ Michelle2 Zenovka
Mm Alder
VWR-197
VWR-3777
VWR-4232
VWR-4794
VWR-13578
Mr Greggan
@ -634,6 +637,8 @@ Teardrops Fall
Techwolf Lupindo
SNOW-92
SNOW-649
SNOW-680
SNOW-681
VWR-12385
tenebrous pau
VWR-247
@ -663,6 +668,8 @@ Tue Torok
CT-74
Vadim Bigbear
VWR-2681
Vector Hastings
VWR-8726
Vixen Heron
VWR-2710
CT-88

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

@ -2787,6 +2787,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>EffectScriptChatParticles</key>
<map>
<key>Comment</key>
<string>1 = normal behavior, 0 = disable display of swirling lights when scripts communicate</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableRippleWater</key>
<map>
<key>Comment</key>

2
indra/newview/llfloaterperms.cpp
View File

@ -115,7 +115,7 @@ U32 LLFloaterPerms::getEveryonePerms(std::string prefix)
//static
U32 LLFloaterPerms::getNextOwnerPerms(std::string prefix)
{
U32 flags = 0;
U32 flags = PERM_MOVE;
if ( gSavedSettings.getBOOL(prefix+"NextOwnerCopy") )
{
flags |= PERM_COPY;

5
indra/newview/llfloatersnapshot.cpp
View File

@ -35,6 +35,7 @@
#include "llagentcamera.h"
#include "llcallbacklist.h"
#include "llcriticaldamp.h"
#include "llfloaterperms.h"
#include "llui.h"
#include "llfocusmgr.h"
#include "llbutton.h"
@ -999,8 +1000,8 @@ void LLSnapshotLivePreview::saveTexture()
LLFolderType::FT_SNAPSHOT_CATEGORY,
LLInventoryType::IT_SNAPSHOT,
PERM_ALL, // Note: Snapshots to inventory is a special case of content upload
PERM_NONE, // that ignores the user's premissions preferences and continues to
PERM_NONE, // always use these fairly permissive hard-coded initial perms. - MG
LLFloaterPerms::getGroupPerms(), // that is more permissive than other uploads
LLFloaterPerms::getEveryonePerms(),
"Snapshot : " + pos_string,
callback, expected_upload_cost, userdata);
gViewerWindow->playSnapshotAnimAndSound();

5
indra/newview/llhudeffectbeam.cpp
View File

@ -305,6 +305,11 @@ void LLHUDEffectBeam::render()
}
}
void LLHUDEffectBeam::renderForTimer()
{
render();
}
void LLHUDEffectBeam::setupParticle(const S32 i)
{
LLVector3d start_pos_global;

1
indra/newview/llhudeffectbeam.h
View File

@ -52,6 +52,7 @@ protected:
~LLHUDEffectBeam();
/*virtual*/ void render();
/*virtual*/ void renderForTimer();
/*virtual*/ void packData(LLMessageSystem *mesgsys);
/*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
private:

5
indra/newview/llhudeffecttrail.cpp
View File

@ -280,3 +280,8 @@ void LLHUDEffectSpiral::render()
return;
}
}
void LLHUDEffectSpiral::renderForTimer()
{
render();
}

1
indra/newview/llhudeffecttrail.h
View File

@ -62,6 +62,7 @@ protected:
~LLHUDEffectSpiral();
/*virtual*/ void render();
/*virtual*/ void renderForTimer();
/*virtual*/ void packData(LLMessageSystem *mesgsys);
/*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
private:

21
indra/newview/llhudobject.cpp
View File

@ -304,6 +304,27 @@ void LLHUDObject::renderAllForSelect()
}
}
// static
void LLHUDObject::renderAllForTimer()
{
LLHUDObject *hud_objp;
hud_object_list_t::iterator object_it;
for (object_it = sHUDObjects.begin(); object_it != sHUDObjects.end(); )
{
hud_object_list_t::iterator cur_it = object_it++;
hud_objp = (*cur_it);
if (hud_objp->getNumRefs() == 1)
{
sHUDObjects.erase(cur_it);
}
else if (hud_objp->isVisible())
{
hud_objp->renderForTimer();
}
}
}
// static
void LLHUDObject::sortObjects()
{

2
indra/newview/llhudobject.h
View File

@ -69,6 +69,7 @@ public:
static void updateAll();
static void renderAll();
static void renderAllForSelect();
static void renderAllForTimer();
static void cleanupHUDObjects();
@ -100,6 +101,7 @@ protected:
virtual void render() = 0;
virtual void renderForSelect() {};
virtual void renderForTimer() {};
protected:
U8 mType;

4
indra/newview/llselectmgr.cpp
View File

@ -5629,6 +5629,10 @@ void LLSelectMgr::updateSelectionCenter()
LLVector3d select_center;
// keep a list of jointed objects for showing the joint HUDEffects
// Initialize the bounding box to the root prim, so the BBox orientation
// matches the root prim's (affecting the orientation of the manipulators).
bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
std::vector < LLViewerObject *> jointed_objects;
for (LLObjectSelection::iterator iter = mSelectedObjects->begin();

3
indra/newview/llviewermessage.cpp
View File

@ -2964,7 +2964,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// Make swirly things only for talking objects. (not script debug messages, though)
if (chat.mSourceType == CHAT_SOURCE_OBJECT
&& chat.mChatType != CHAT_TYPE_DEBUG_MSG)
&& chat.mChatType != CHAT_TYPE_DEBUG_MSG
&& gSavedSettings.getBOOL("EffectScriptChatParticles") )
{
LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
psc->setSourceObject(chatter);

21
indra/newview/pipeline.cpp
View File

@ -3211,11 +3211,24 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
LLVertexBuffer::unbind();
if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred)
{
// Render debugging beacons.
gObjectList.renderObjectBeacons();
gObjectList.resetObjectBeacons();
if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
{
// Render debugging beacons.
gObjectList.renderObjectBeacons();
gObjectList.resetObjectBeacons();
}
else
{
// Make sure particle effects disappear
LLHUDObject::renderAllForTimer();
}
}
else
{
// Make sure particle effects disappear
LLHUDObject::renderAllForTimer();
}
LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");