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

Merge viewer-lynx

master
Ansariel 2019-09-30 19:05:31 +02:00
parent e8b426d1c2 7829b4d3f4
commit 287c920ff2
14 changed files with 180 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llwindow/lldxhardware.cpp
View File

@ -616,6 +616,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, bool disable_wmi)
IDxDiagContainer *device_containerp = NULL;
IDxDiagContainer *file_containerp = NULL;
IDxDiagContainer *driver_containerp = NULL;
DWORD dw_device_count;
// CoCreate a IDxDiagProvider*
LL_DEBUGS("AppInit") << "CoCreateInstance IID_IDxDiagProvider" << LL_ENDL;
@ -666,9 +667,18 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, bool disable_wmi)
hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
if(FAILED(hr) || !devices_containerp)
{
// do not release 'dirty' devices_containerp at this stage, only dx_diag_rootp
devices_containerp = NULL;
goto LCleanup;
}
// make sure there is something inside
hr = devices_containerp->GetNumberOfChildContainers(&dw_device_count);
if (FAILED(hr) || dw_device_count == 0)
{
goto LCleanup;
}
// Get device 0
LL_DEBUGS("AppInit") << "devices_containerp->GetChildContainer" << LL_ENDL;
hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
@ -879,6 +889,7 @@ LLSD LLDXHardware::getDisplayInfo()
IDxDiagContainer *device_containerp = NULL;
IDxDiagContainer *file_containerp = NULL;
IDxDiagContainer *driver_containerp = NULL;
DWORD dw_device_count;
// CoCreate a IDxDiagProvider*
LL_INFOS() << "CoCreateInstance IID_IDxDiagProvider" << LL_ENDL;
@ -929,9 +940,18 @@ LLSD LLDXHardware::getDisplayInfo()
hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
if(FAILED(hr) || !devices_containerp)
{
// do not release 'dirty' devices_containerp at this stage, only dx_diag_rootp
devices_containerp = NULL;
goto LCleanup;
}
// make sure there is something inside
hr = devices_containerp->GetNumberOfChildContainers(&dw_device_count);
if (FAILED(hr) || dw_device_count == 0)
{
goto LCleanup;
}
// Get device 0
LL_INFOS() << "devices_containerp->GetChildContainer" << LL_ENDL;
hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
@ -983,6 +1003,10 @@ LLSD LLDXHardware::getDisplayInfo()
}
LCleanup:
if (ret.emptyMap())
{
LL_INFOS() << "Failed to get data, cleaning up" << LL_ENDL;
}
SAFE_RELEASE(file_containerp);
SAFE_RELEASE(driver_containerp);
SAFE_RELEASE(device_containerp);

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

@ -12110,7 +12110,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>RenderShadowResolutionScale</key>
<map>
<key>Comment</key>
<string>Scale of shadow map resolution vs. screen resolution</string>
<string>Scale of shadow map resolution vs. screen resolution (only positivie values are allowed)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

2
indra/newview/llface.cpp
View File

@ -478,7 +478,7 @@ void LLFace::setTextureIndex(U8 index)
}
else
{
if (mDrawInfo && !mDrawInfo->mTextureList.empty())
if (mDrawInfo && mDrawInfo->mTextureList.size() <= 1)
{
LL_ERRS() << "Face with no texture index references indexed texture draw info." << LL_ENDL;
}

11
indra/newview/llfloatergroupinvite.cpp
View File

@ -108,7 +108,7 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite()
}
// static
void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agent_ids)
void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agent_ids, bool request_update)
{
const LLFloater::Params& floater_params = LLFloater::getDefaultParams();
S32 floater_header_size = floater_params.header_height;
@ -126,9 +126,12 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agen
group_id,
(LLFloaterGroupInvite*)NULL);
// refresh group information
gAgent.sendAgentDataUpdateRequest();
LLGroupMgr::getInstance()->clearGroupData(group_id);
if (request_update)
{
// refresh group information
gAgent.sendAgentDataUpdateRequest();
LLGroupMgr::getInstance()->clearGroupData(group_id);
}
if (!fgi)

2
indra/newview/llfloatergroupinvite.h
View File

@ -37,7 +37,7 @@ class LLFloaterGroupInvite
public:
virtual ~LLFloaterGroupInvite();
static void showForGroup(const LLUUID &group_id, uuid_vec_t *agent_ids = NULL);
static void showForGroup(const LLUUID &group_id, uuid_vec_t *agent_ids = NULL, bool request_update = true);
protected:
LLFloaterGroupInvite(const LLUUID& group_id = LLUUID::null);

1
indra/newview/llpanelclassified.cpp
View File

@ -783,6 +783,7 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t
setClassifiedName(c_info->name);
setDescription(c_info->description);
setSnapshotId(c_info->snapshot_id);
setParcelId(c_info->parcel_id);
setPosGlobal(c_info->pos_global);
setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global));

2
indra/newview/llpanelgrouproles.cpp
View File

@ -1188,7 +1188,7 @@ void LLPanelGroupMembersSubTab::onInviteMember(void *userdata)
void LLPanelGroupMembersSubTab::handleInviteMember()
{
LLFloaterGroupInvite::showForGroup(mGroupID);
LLFloaterGroupInvite::showForGroup(mGroupID, NULL, false);
}
void LLPanelGroupMembersSubTab::onEjectMembers(void *userdata)

2
indra/newview/pipeline.cpp
View File

@ -1069,7 +1069,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
mDeferredLight.release();
}
F32 scale = RenderShadowResolutionScale;
F32 scale = llmax(0.f, RenderShadowResolutionScale);
if (shadow_detail > 0)
{ //allocate 4 sun shadow maps

137
indra/newview/skins/default/xui/en/floater_avatar_textures.xml
View File

@ -29,11 +29,13 @@
name="scroll_content_panel"
follows="left|top"
min_height="300"
min_width="300"
layout="topleft"
top="0"
background_visible="false"
left="0"
height="680">
height="1165"
width="1015">
<text
type="string"
length="1"
@ -103,6 +105,14 @@ Textures
name="hair_alpha"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Hair Tattoo"
layout="topleft"
left_pad="7"
name="hair_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
@ -136,6 +146,14 @@ Textures
name="head_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Head Unv Tattoo"
layout="topleft"
left_pad="7"
name="head_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
@ -161,6 +179,14 @@ Textures
name="eyes_alpha"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Eyes Tattoo"
layout="topleft"
left_pad="7"
name="eyes_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
@ -226,6 +252,14 @@ Textures
name="upper_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Upper Unv Tattoo"
layout="topleft"
left_pad="7"
name="upper_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
@ -299,6 +333,14 @@ Textures
name="lower_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Lower Unv Tattoo"
layout="topleft"
left_pad="7"
name="lower_universal_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
@ -316,6 +358,99 @@ Textures
name="skirt"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Skirt Tattoo"
layout="topleft"
left_pad="7"
name="skirt_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Left Arm"
layout="topleft"
left="10"
name="leftarm-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="Left Arm Tattoo"
layout="topleft"
left_pad="21"
name="leftarm_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="Left Leg"
layout="topleft"
left="10"
name="leftleg-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="Left Leg Tattoo"
layout="topleft"
left_pad="21"
name="leftleg_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 1"
layout="topleft"
left="10"
name="aux1-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 1 Tattoo"
layout="topleft"
left_pad="21"
name="aux1_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 2"
layout="topleft"
left="10"
name="aux2-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 2 Tattoo"
layout="topleft"
left_pad="21"
name="aux2_tattoo"
top_delta="0"
width="92" />
<texture_picker
height="103"
label="AUX 3"
layout="topleft"
left="10"
name="aux3-baked"
top_delta="100"
width="92" />
<texture_picker
height="103"
label="AUX 3 Tattoo"
layout="topleft"
left_pad="21"
name="aux3_tattoo"
top_delta="0"
width="92" />
</panel>
</panel>
</scroll_container>

1
indra/newview/skins/default/xui/en/panel_edit_classified.xml
View File

@ -146,7 +146,6 @@
follows="left|top|right"
height="100"
width="273"
hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"

1
indra/newview/skins/default/xui/en/panel_pick_info.xml
View File

@ -105,7 +105,6 @@ bg_opaque_color="DkGray"
height="100"
width="280"
parse_urls="true"
hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"

6
indra/newview/skins/default/xui/fr/floater_about_land.xml
View File

@ -366,10 +366,10 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
Photo :
</text>
<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
<text name="allow_see_label">
<text name="allow_see_label" top="170">
Les avatars sur d&apos;autres parcelles peuvent voir et chatter avec les avatars sur cette parcelle.
</text>
<check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux avatars présents sur d&apos;autres parcelles de voir et chatter avec les avatars présents sur cette parcelle et à vous de les voir et de chatter avec eux."/>
<check_box label="Voir les avatars" name="SeeAvatarsCheck" top="170" tool_tip="Permettre aux avatars présents sur d&apos;autres parcelles de voir et chatter avec les avatars présents sur cette parcelle et à vous de les voir et de chatter avec eux."/>
<text name="landing_point">
Lieu d&apos;arrivée : [LANDING]
</text>
@ -449,7 +449,7 @@ musique :
<panel.string name="estate_override">
Au moins une de ces options est définie au niveau du domaine.
</panel.string>
<check_box label="Tout le monde peut rendre visite (Des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée)" name="public_access"/>
<check_box label="Tout le monde peut rendre visite" tool_tip="Des lignes d&apos;interdiction seront créées si cette case n&apos;est pas cochée" name="public_access"/>
<check_box label="Doit avoir plus de 18 ans [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour accéder à cette parcelle, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
<check_box label="Les infos de paiement doivent être enregistrées dans le dossier [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Pour pouvoir accéder à cette parcelle, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
<check_box label="Autoriser le groupe [GROUP] sans restrictions" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>

4
indra/newview/skins/default/xui/pt/floater_about_land.xml
View File

@ -368,10 +368,10 @@ Apenas lotes maiores podem ser listados na busca.
Foto:
</text>
<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
<text name="allow_see_label">
<text name="allow_see_label" top="170">
Avatares em outros lotes podem ver e conversar com avatares neste lote
</text>
<check_box label="Ver avatares" name="SeeAvatarsCheck" tool_tip="Permite que os avatares em outros lotes vejam e batam papo com avatares neste lote. Você poderá vê-los e conversar com eles."/>
<check_box label="Ver avatares" name="SeeAvatarsCheck" top="170" tool_tip="Permite que os avatares em outros lotes vejam e batam papo com avatares neste lote. Você poderá vê-los e conversar com eles."/>
<text name="landing_point">
Ponto de Aterrissagem: [LANDING]
</text>

4
indra/newview/skins/default/xui/tr/floater_about_land.xml
View File

@ -360,10 +360,10 @@ Sadece büyük parseller aramada görünür.
Anlık Görüntü:
</text>
<texture_picker name="snapshot_ctrl" tool_tip="Bir resim seçmek için tıklayın"/>
<text name="allow_see_label">
<text name="allow_see_label" top="170">
Diğer parsellerdeki avatarlar bu parseldeki avatarları görebilir ve onlarla sohbet edebilir
</text>
<check_box label="Avatarları Gör" name="SeeAvatarsCheck" tool_tip="Diğer parsellerdeki avatarların bu parseldeki avatarları görmesine ve onlarla sohbet etmesine, sizin de onları görüp, onlarla sohbet etmenize imkan tanır."/>
<check_box label="Avatarları Gör" name="SeeAvatarsCheck" top="170" tool_tip="Diğer parsellerdeki avatarların bu parseldeki avatarları görmesine ve onlarla sohbet etmesine, sizin de onları görüp, onlarla sohbet etmenize imkan tanır."/>
<text name="landing_point">
İniş Noktası: [LANDING]
</text>