summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llagentwearables.cpp117
-rw-r--r--indra/newview/llappearancemgr.cpp1
-rw-r--r--indra/newview/llfloaterevent.cpp53
-rw-r--r--indra/newview/llfloaterevent.h3
-rw-r--r--indra/newview/llvoavatarself.cpp7
-rw-r--r--indra/newview/llvovolume.cpp2
-rw-r--r--indra/newview/llworldmap.h1
-rw-r--r--indra/newview/skins/default/xui/en/floater_env_settings.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_event.xml50
-rw-r--r--indra/newview/skins/default/xui/en/floater_water.xml109
-rw-r--r--indra/newview/skins/default/xui/en/floater_windlight_options.xml741
-rw-r--r--indra/newview/skins/default/xui/en/panel_teleport_history.xml2
12 files changed, 637 insertions, 461 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 08cd101b01..11ac103b3a 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -245,6 +245,7 @@ void LLAgentWearables::setAvatarObject(LLVOAvatarSelf *avatar)
// wearables
LLAgentWearables::createStandardWearablesAllDoneCallback::~createStandardWearablesAllDoneCallback()
{
+ llinfos << "destructor - all done?" << llendl;
gAgentWearables.createStandardWearablesAllDone();
}
@@ -271,10 +272,16 @@ LLAgentWearables::addWearableToAgentInventoryCallback::addWearableToAgentInvento
mTodo(todo),
mCB(cb)
{
+ llinfos << "constructor" << llendl;
}
void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& inv_item)
{
+ if (mTodo & CALL_CREATESTANDARDDONE)
+ {
+ llinfos << "callback fired, inv_item " << inv_item.asString() << llendl;
+ }
+
if (inv_item.isNull())
return;
@@ -294,6 +301,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i
*/
if (mTodo & CALL_CREATESTANDARDDONE)
{
+ LLAppearanceManager::instance().addCOFItemLink(inv_item,false);
gAgentWearables.createStandardWearablesDone(mType, mIndex);
}
if (mTodo & CALL_MAKENEWOUTFITDONE)
@@ -311,6 +319,8 @@ void LLAgentWearables::addWearabletoAgentInventoryDone(const S32 type,
const LLUUID& item_id,
LLWearable* wearable)
{
+ llinfos << "type " << type << " index " << index << " item " << item_id.asString() << llendl;
+
if (item_id.isNull())
return;
@@ -1140,6 +1150,80 @@ void LLAgentWearables::addLocalTextureObject(const EWearableType wearable_type,
wearable->setLocalTextureObject(texture_type, lto);
}
+class OnWearableItemCreatedCB: public LLInventoryCallback
+{
+public:
+ OnWearableItemCreatedCB():
+ mWearablesAwaitingItems(WT_COUNT,NULL)
+ {
+ llinfos << "created callback" << llendl;
+ }
+ /* virtual */ void fire(const LLUUID& inv_item)
+ {
+ llinfos << "One item created " << inv_item.asString() << llendl;
+ LLViewerInventoryItem *item = gInventory.getItem(inv_item);
+ mItemsToLink.put(item);
+ updatePendingWearable(inv_item);
+ }
+ ~OnWearableItemCreatedCB()
+ {
+ llinfos << "All items created" << llendl;
+ LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy;
+ LLAppearanceManager::instance().linkAll(LLAppearanceManager::instance().getCOF(),
+ mItemsToLink,
+ link_waiter);
+ }
+ void addPendingWearable(LLWearable *wearable)
+ {
+ if (!wearable)
+ {
+ llwarns << "no wearable" << llendl;
+ return;
+ }
+ EWearableType type = wearable->getType();
+ if (type<WT_COUNT)
+ {
+ mWearablesAwaitingItems[type] = wearable;
+ }
+ else
+ {
+ llwarns << "invalid type " << type << llendl;
+ }
+ }
+ void updatePendingWearable(const LLUUID& inv_item)
+ {
+ LLViewerInventoryItem *item = gInventory.getItem(inv_item);
+ if (!item)
+ {
+ llwarns << "no item found" << llendl;
+ return;
+ }
+ if (!item->isWearableType())
+ {
+ llwarns << "non-wearable item found" << llendl;
+ return;
+ }
+ if (item && item->isWearableType())
+ {
+ EWearableType type = item->getWearableType();
+ if (type < WT_COUNT)
+ {
+ LLWearable *wearable = mWearablesAwaitingItems[type];
+ if (wearable)
+ wearable->setItemID(inv_item);
+ }
+ else
+ {
+ llwarns << "invalid wearable type " << type << llendl;
+ }
+ }
+ }
+
+private:
+ LLInventoryModel::item_array_t mItemsToLink;
+ std::vector<LLWearable*> mWearablesAwaitingItems;
+};
+
void LLAgentWearables::createStandardWearables(BOOL female)
{
llwarns << "Creating Standard " << (female ? "female" : "male")
@@ -1169,35 +1253,34 @@ void LLAgentWearables::createStandardWearables(BOOL female)
FALSE //WT_SKIRT
};
+ LLPointer<LLInventoryCallback> cb = new OnWearableItemCreatedCB;
for (S32 i=0; i < WT_COUNT; i++)
{
- bool once = false;
- LLPointer<LLRefCount> donecb = NULL;
if (create[i])
{
- if (!once)
- {
- once = true;
- donecb = new createStandardWearablesAllDoneCallback;
- }
llassert(getWearableCount((EWearableType)i) == 0);
LLWearable* wearable = LLWearableList::instance().createNewWearable((EWearableType)i);
- U32 index = pushWearable((EWearableType)i,wearable);
+ ((OnWearableItemCreatedCB*)(&(*cb)))->addPendingWearable(wearable);
// no need to update here...
- LLPointer<LLInventoryCallback> cb =
- new addWearableToAgentInventoryCallback(
- donecb,
- i,
- index,
- wearable,
- addWearableToAgentInventoryCallback::CALL_CREATESTANDARDDONE);
- addWearableToAgentInventory(cb, wearable, LLUUID::null, FALSE);
+ LLUUID category_id = LLUUID::null;
+ create_inventory_item(gAgent.getID(),
+ gAgent.getSessionID(),
+ category_id,
+ wearable->getTransactionID(),
+ wearable->getName(),
+ wearable->getDescription(),
+ wearable->getAssetType(),
+ LLInventoryType::IT_WEARABLE,
+ wearable->getType(),
+ wearable->getPermissions().getMaskNextOwner(),
+ cb);
}
}
}
void LLAgentWearables::createStandardWearablesDone(S32 type, U32 index)
{
+ llinfos << "type " << type << " index " << index << llendl;
if (mAvatarObject)
{
mAvatarObject->updateVisualParams();
@@ -1208,6 +1291,8 @@ void LLAgentWearables::createStandardWearablesAllDone()
{
// ... because sendAgentWearablesUpdate will notify inventory
// observers.
+ llinfos << "all done?" << llendl;
+
mWearablesLoaded = TRUE;
checkWearablesLoaded();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index c9da08701d..71df064236 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -565,6 +565,7 @@ public:
{
llinfos << "Recovered item for type " << mType << llendl;
LLViewerInventoryItem *itemp = gInventory.getItem(item_id);
+ mWearable->setItemID(item_id);
LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder);
mHolder->mTypesToRecover.erase(mType);
link_inventory_item( gAgent.getID(),
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index 64efa10ef9..97ebab3425 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -58,6 +58,7 @@
#include "llviewercontrol.h"
#include "llweb.h"
#include "llworldmap.h"
+#include "llworldmapmessage.h"
#include "lluictrlfactory.h"
#include "lltrans.h"
@@ -215,16 +216,15 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **)
std::string desc = floater->mEventInfo.mSimName + llformat(" (%d, %d, %d)", region_x, region_y, region_z);
floater->mTBLocation->setText(desc);
- if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE)
- {
- floater->childSetVisible("event_mature_yes", TRUE);
- floater->childSetVisible("event_mature_no", FALSE);
- }
- else
- {
- floater->childSetVisible("event_mature_yes", FALSE);
- floater->childSetVisible("event_mature_no", TRUE);
- }
+ floater->childSetVisible("rating_icon_m", FALSE);
+ floater->childSetVisible("rating_icon_r", FALSE);
+ floater->childSetVisible("rating_icon_pg", FALSE);
+ floater->childSetValue("rating_value", floater->getString("unknown"));
+
+ //for some reason there's not adult flags for now, so see if region is adult and then
+ //set flags
+ LLWorldMapMessage::url_callback_t cb = boost::bind( &regionInfoCallback, floater->mEventInfo.mID, _1);
+ LLWorldMapMessage::getInstance()->sendNamedRegionRequest(floater->mEventInfo.mSimName, cb, std::string("unused"), false);
if (floater->mEventInfo.mUnixTime < time_corrected())
{
@@ -249,6 +249,39 @@ void LLFloaterEvent::processEventInfoReply(LLMessageSystem *msg, void **)
}
}
+//static
+void LLFloaterEvent::regionInfoCallback(U32 event_id, U64 region_handle)
+{
+ LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromHandle(region_handle);
+ LLFloaterEvent* floater = LLFloaterReg::getTypedInstance<LLFloaterEvent>("event");
+
+ if (sim_info && floater && (event_id == floater->getEventID()))
+ {
+ // update the event with the maturity info
+ if (sim_info->isAdult())
+ {
+ floater->childSetVisible("rating_icon_m", FALSE);
+ floater->childSetVisible("rating_icon_r", TRUE);
+ floater->childSetVisible("rating_icon_pg", FALSE);
+ floater->childSetValue("rating_value", floater->getString("adult"));
+
+ }
+ else if (floater->mEventInfo.mEventFlags & EVENT_FLAG_MATURE)
+ {
+ floater->childSetVisible("rating_icon_m", TRUE);
+ floater->childSetVisible("rating_icon_r", FALSE);
+ floater->childSetVisible("rating_icon_pg", FALSE);
+ floater->childSetValue("rating_value", floater->getString("moderate"));
+ }
+ else
+ {
+ floater->childSetVisible("rating_icon_m", FALSE);
+ floater->childSetVisible("rating_icon_r", FALSE);
+ floater->childSetVisible("rating_icon_pg", TRUE);
+ floater->childSetValue("rating_value", floater->getString("general"));
+ }
+ }
+}
void LLFloaterEvent::draw()
{
diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
index 54aaaf6a0f..4126236964 100644
--- a/indra/newview/llfloaterevent.h
+++ b/indra/newview/llfloaterevent.h
@@ -70,7 +70,8 @@ protected:
static void onClickNotify(void*);
void onClickDeleteEvent();
-// static bool callbackCreateEventWebPage(const LLSD& notification, const LLSD& response);
+ static void regionInfoCallback(U32 event_id, U64 region_handle);
+
protected:
U32 mEventID;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 4347dec805..f8b5bfc718 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1655,8 +1655,11 @@ BOOL LLVOAvatarSelf::updateIsFullyLoaded()
{
BOOL loading = FALSE;
- // do we have a shape?
- if (visualParamWeightsAreDefault())
+ // do we have our body parts?
+ if (gAgentWearables.getWearableCount(WT_SHAPE) == 0 ||
+ gAgentWearables.getWearableCount(WT_HAIR) == 0 ||
+ gAgentWearables.getWearableCount(WT_EYES) == 0 ||
+ gAgentWearables.getWearableCount(WT_SKIN) == 0)
{
loading = TRUE;
}
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f1b27fb4df..86d8204473 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1412,7 +1412,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
return res;
}
- dirtySpatialGroup();
+ dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1));
BOOL compiled = FALSE;
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index 7e37727b86..e4e677eb64 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -123,6 +123,7 @@ public:
bool isName(const std::string& name) const;
bool isDown() { return (mAccess == SIM_ACCESS_DOWN); }
bool isPG() { return (mAccess <= SIM_ACCESS_PG); }
+ bool isAdult() { return (mAccess == SIM_ACCESS_ADULT); }
// Debug only
void dump() const; // Print the region info to the standard output
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 8c87bd42dd..14f9e2db95 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -135,28 +135,28 @@
width="210" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Use Estate Time"
layout="topleft"
- left="8"
+ left="10"
name="EnvUseEstateTimeButton"
top="120"
width="137" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Advanced Sky"
layout="topleft"
- left_pad="9"
+ left_pad="3"
name="EnvAdvancedSkyButton"
top_delta="0"
width="137" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Advanced Water"
layout="topleft"
- left_pad="9"
+ left_pad="3"
name="EnvAdvancedWaterButton"
top_delta="0"
width="137" />
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 50f0f0454c..c2fab900e3 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -20,6 +20,22 @@
name="dont_notify">
Don&apos;t Notify
</floater.string>
+ <floater.string
+ name="moderate">
+ Moderate
+ </floater.string>
+ <floater.string
+ name="adult">
+ Adult
+ </floater.string>
+ <floater.string
+ name="general">
+ General
+ </floater.string>
+ <floater.string
+ name="unknown">
+ Unknown
+ </floater.string>
<layout_stack
name="layout"
orientation="vertical"
@@ -144,15 +160,33 @@
name="event_location"
use_ellipses="true"
value="SampleParcel, Name Long (145, 228, 26)"
- width="310" />
+ width="310" />
<icon
- follows="top|left"
- height="16"
- image_name="Parcel_PG_Dark"
- layout="topleft"
- left="10"
- name="rating_icon"
- width="18" />
+ follows="top|left"
+ height="16"
+ image_name="Parcel_PG_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_pg"
+ width="18" />
+ <icon
+ follows="top|left"
+ height="16"
+ image_name="Parcel_M_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_m"
+ top_delta="0"
+ width="18" />
+ <icon
+ follows="top|left"
+ height="16"
+ image_name="Parcel_R_Dark"
+ layout="topleft"
+ left="10"
+ name="rating_icon_r"
+ top_delta="0"
+ width="18" />
<text
follows="left|top"
height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index 32739ac953..3a44ba3763 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -16,49 +16,49 @@
type="string"
length="1"
follows="left|top|right"
- font.style="BOLD"
height="16"
layout="topleft"
left="10"
name="KeyFramePresetsText"
top="34"
- width="110">
+ font="SansSerif"
+ width="85">
Water Presets:
</text>
<combo_box
- height="18"
+ height="23"
layout="topleft"
- left_pad="10"
+ left_delta="95"
name="WaterPresetsCombo"
- top_delta="-2"
+ top_delta="-4"
width="150" />
<button
- height="20"
+ height="23"
label="New"
label_selected="New"
layout="topleft"
- left_pad="20"
+ left_pad="3"
name="WaterNewPreset"
- top_delta="1"
- width="90" />
+ top_delta="0"
+ width="70" />
<button
- height="20"
+ height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="10"
+ left_pad="3"
name="WaterSavePreset"
top_delta="0"
- width="90" />
+ width="70" />
<button
- height="20"
+ height="23"
label="Delete"
label_selected="Delete"
layout="topleft"
- left_pad="10"
+ left_pad="3"
name="WaterDeletePreset"
top_delta="0"
- width="90" />
+ width="70" />
<tab_container
border="false"
follows="left|top"
@@ -74,7 +74,7 @@
border="true"
follows="all"
height="180"
- label="Settings"
+ label="SETTINGS"
layout="topleft"
left="0"
mouse_opaque="false"
@@ -331,7 +331,7 @@
border="true"
follows="all"
height="180"
- label="Image"
+ label="IMAGE"
layout="topleft"
left="0"
mouse_opaque="false"
@@ -348,7 +348,7 @@
layout="topleft"
left="10"
name="BHText"
- top="10"
+ top="4"
width="200">
Big Wave Direction
</text>
@@ -361,23 +361,10 @@
layout="topleft"
left="10"
name="WaterWave1DirXText"
- top_pad="4"
+ top_pad="5"
width="10">
X
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="WaterWave1DirYText"
- top_delta="18"
- width="10">
- Y
- </text>
<slider
control_name="WaterWave1DirX"
decimal_digits="2"
@@ -390,8 +377,22 @@
max_val="4"
min_val="-4"
name="WaterWave1DirX"
- top="55"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="WaterWave1DirYText"
+ top_pad="-15"
+ width="10">
+ Y
+ </text>
<slider
control_name="WaterWave1DirY"
decimal_digits="2"
@@ -404,7 +405,8 @@
max_val="4"
min_val="-4"
name="WaterWave1DirY"
- top_pad="5"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -413,9 +415,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="BHText2"
- top_delta="3"
+ top_pad="-10"
width="355">
Little Wave Direction
</text>
@@ -427,24 +429,12 @@
height="16"
layout="topleft"
left="10"
+ left_delta="0"
name="WaterWave2DirXText"
- top="90"
+ top_pad="5"
width="10">
X
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="WaterWave2DirYText"
- top_delta="20"
- width="10">
- Y
- </text>
<slider
control_name="WaterWave2DirX"
decimal_digits="2"
@@ -457,8 +447,22 @@
max_val="4"
min_val="-4"
name="WaterWave2DirX"
- top="115"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="WaterWave2DirYText"
+ top_pad="-15"
+ width="10">
+ Y
+ </text>
<slider
control_name="WaterWave2DirY"
decimal_digits="2"
@@ -471,7 +475,8 @@
max_val="4"
min_val="-4"
name="WaterWave2DirY"
- top_pad="10"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 0cb7814c6a..d09a41978d 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- height="220"
+ height="256"
layout="topleft"
name="WindLight floater"
help_topic="windlight_floater"
@@ -22,68 +22,64 @@
left="10"
name="KeyFramePresetsText"
top="34"
- width="110">
+ width="85">
Sky Presets:
</text>
<combo_box
- height="18"
+ height="23"
layout="topleft"
- left_delta="110"
+ left_delta="85"
name="WLPresetsCombo"
- top_delta="-2"
+ top_delta="-4"
width="150" />
<button
- height="20"
+ height="23"
label="New"
label_selected="New"
layout="topleft"
- left_pad="20"
+ left_pad="3"
name="WLNewPreset"
- top_delta="1"
width="70" />
<button
- height="20"
+ height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="10"
+ left_pad="3"
name="WLSavePreset"
- top_delta="0"
width="70" />
<button
- height="20"
+ height="23"
label="Delete"
label_selected="Delete"
layout="topleft"
- left_pad="10"
+ left_pad="3"
name="WLDeletePreset"
- top_delta="0"
width="70" />
<button
- height="20"
+ height="23"
label="Day Cycle Editor"
label_selected="Day Cycle Editor"
layout="topleft"
- left_pad="50"
+ right="-10"
name="WLDayCycleMenuButton"
- top_delta="0"
+ top_pad="-23"
width="120" />
<tab_container
follows="left|top"
- height="160"
+ height="196"
halign="center"
layout="topleft"
left="0"
name="WindLight Tabs"
tab_position="top"
- tab_height="20"
top="60"
width="700">
<panel
border="true"
follows="left|top|right|bottom"
- height="160"
- label="Atmosphere"
+ height="196"
+ label="ATMOSPHERE"
layout="topleft"
left="1"
mouse_opaque="false"
@@ -113,10 +109,22 @@
layout="topleft"
left="10"
name="BHText2"
- top="21"
+ top_pad="5"
width="10">
R
</text>
+ <slider
+ control_name="WLBlueHorizonR"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLBlueHorizonR"
+ width="200" />
<text
type="string"
length="1"
@@ -124,12 +132,25 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left="10"
+ top_pad="-15"
name="BHText3"
- top_delta="11"
width="10">
G
</text>
+ <slider
+ control_name="WLBlueHorizonG"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_delta="0"
+ name="WLBlueHorizonG"
+ left_pad="3"
+ top_pad="6"
+ width="200" />
<text
type="string"
length="1"
@@ -137,12 +158,24 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
name="BHText4"
- top_delta="11"
+ left="10"
+ top_pad="-15"
width="10">
B
</text>
+ <slider
+ control_name="WLBlueHorizonB"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ name="WLBlueHorizonB"
+ left_pad="3"
+ top_pad="6"
+ width="200" />
<text
type="string"
length="1"
@@ -150,49 +183,13 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
name="BHText5"
- top_delta="11"
+ left="10"
+ top_pad="-15"
width="10">
I
</text>
<slider
- control_name="WLBlueHorizonR"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left="24"
- name="WLBlueHorizonR"
- top="40"
- width="200" />
- <slider
- control_name="WLBlueHorizonG"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left_delta="0"
- name="WLBlueHorizonG"
- top_pad="1"
- width="200" />
- <slider
- control_name="WLBlueHorizonB"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left_delta="0"
- name="WLBlueHorizonB"
- top_pad="1"
- width="200" />
- <slider
control_name="WLBlueHorizonI"
decimal_digits="2"
follows="left"
@@ -200,9 +197,9 @@
increment="0.01"
initial_value="1.0"
layout="topleft"
- left_delta="0"
name="WLBlueHorizonI"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -211,9 +208,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left="10"
+ top_pad="-10"
name="BDensText"
- top_delta="-2"
width="355">
Haze Horizon
</text>
@@ -225,9 +222,10 @@
increment="0.01"
initial_value="0.25"
layout="topleft"
- left="24"
+ left="23"
+ top_delta="0"
+ top_pad="27"
name="WLHazeHorizon"
- top="107"
width="200" />
<text
type="string"
@@ -251,10 +249,22 @@
layout="topleft"
left="245"
name="BHText6"
- top="21"
+ top_pad="5"
width="10">
R
</text>
+ <slider
+ control_name="WLBlueDensityR"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLBlueDensityR"
+ width="200" />
<text
type="string"
length="1"
@@ -262,50 +272,12 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left="245"
name="BHText7"
- top_delta="11"
+ top_pad="-15"
width="10">
G
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText8"
- top_delta="11"
- width="10">
- B
- </text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText9"
- top_delta="11"
- width="10">
- I
- </text>
- <slider
- control_name="WLBlueDensityR"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left="259"
- name="WLBlueDensityR"
- top="40"
- width="200" />
<slider
control_name="WLBlueDensityG"
decimal_digits="2"
@@ -316,8 +288,22 @@
layout="topleft"
left_delta="0"
name="WLBlueDensityG"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left="245"
+ name="BHText8"
+ top_pad="-15"
+ width="10">
+ B
+ </text>
<slider
control_name="WLBlueDensityB"
decimal_digits="2"
@@ -328,8 +314,22 @@
layout="topleft"
left_delta="0"
name="WLBlueDensityB"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left="245"
+ name="BHText9"
+ top_pad="-15"
+ width="10">
+ I
+ </text>
<slider
control_name="WLBlueDensityI"
decimal_digits="2"
@@ -340,7 +340,8 @@
layout="topleft"
left_delta="0"
name="WLBlueDensityI"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -349,9 +350,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left="245"
name="HDText"
- top_delta="-2"
+ top_pad="-10"
width="355">
Haze Density
</text>
@@ -363,10 +364,10 @@
increment="0.01"
initial_value="0.7"
layout="topleft"
- left="259"
+ left="258"
max_val="4"
name="WLHazeDensity"
- top="107"
+ top_pad="27"
width="200" />
<text
type="string"
@@ -389,10 +390,10 @@
increment="0.01"
initial_value="0.1"
layout="topleft"
- left="494"
+ left_delta="13"
max_val="0.9"
name="WLDensityMult"
- top="40"
+ top_pad="27"
width="200" />
<text
type="string"
@@ -401,9 +402,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="WLDistanceMultText"
- top_delta="-3"
+ top_pad="-10"
width="355">
Distance Multiplier
</text>
@@ -414,11 +415,11 @@
height="10"
initial_value="1.0"
layout="topleft"
- left="494"
+ left_delta="13"
max_val="100"
name="WLDistanceMult"
- top="73"
- width="207" />
+ top_pad="27"
+ width="200" />
<text
type="string"
length="1"
@@ -426,9 +427,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="MaxAltText"
- top_delta="-2"
+ top_pad="-15"
width="355">
Max Altitude
</text>
@@ -440,17 +441,17 @@
increment="1"
initial_value="500"
layout="topleft"
- left="494"
+ left_delta="13"
max_val="4000"
name="WLMaxAltitude"
- top="107"
- width="205" />
+ top_pad="27"
+ width="200" />
</panel>
<panel
border="true"
follows="left|top|right|bottom"
- height="160"
- label="Lighting"
+ height="196"
+ label="LIGHTING"
layout="topleft"
left_delta="0"
help_topic="windlight_lighting_tab"
@@ -477,12 +478,24 @@
halign="center"
height="16"
layout="topleft"
- left="10"
+ left_delta="0"
name="BHText"
- top="21"
+ top_pad="5"
width="10">
R
</text>
+ <slider
+ control_name="WLSunlightR"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLSunlightR"
+ width="200" />
<text
type="string"
length="1"
@@ -490,50 +503,12 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText2"
- top_delta="11"
+ top_pad="-15"
width="10">
G
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText3"
- top_delta="11"
- width="10">
- B
- </text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText4"
- top_delta="11"
- width="10">
- I
- </text>
- <slider
- control_name="WLSunlightR"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left="24"
- name="WLSunlightR"
- top="40"
- width="200" />
<slider
control_name="WLSunlightG"
decimal_digits="2"
@@ -544,8 +519,22 @@
layout="topleft"
left_delta="0"
name="WLSunlightG"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText3"
+ top_pad="-15"
+ width="10">
+ B
+ </text>
<slider
control_name="WLSunlightB"
decimal_digits="2"
@@ -556,8 +545,22 @@
layout="topleft"
left_delta="0"
name="WLSunlightB"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText4"
+ top_pad="-15"
+ width="10">
+ I
+ </text>
<slider
control_name="WLSunlightI"
decimal_digits="2"
@@ -568,7 +571,8 @@
layout="topleft"
left_delta="0"
name="WLSunlightI"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -577,9 +581,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="TODText"
- top_delta="-2"
+ top_pad="-10"
width="355">
Sun/Moon Position
</text>
@@ -587,9 +591,9 @@
height="20"
image_name="icon_diurnal.tga"
layout="topleft"
- left="30"
+ left_delta="14"
+ top_pad="10"
name="SkyDayCycle"
- top="97"
width="148" />
<slider
control_name="WLSunAngle"
@@ -598,10 +602,10 @@
increment="0.001"
initial_value="0.7"
layout="topleft"
- left="24"
+ left_delta="-8"
name="WLSunAngle"
- top="137"
- width="204" />
+ top_pad="20"
+ width="207" />
<text
type="string"
length="1"
@@ -622,12 +626,24 @@
halign="center"
height="16"
layout="topleft"
- left="245"
+ left_delta="0"
name="BHText5"
- top="21"
+ top_pad="5"
width="10">
R
</text>
+ <slider
+ control_name="WLAmbientR"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLAmbientR"
+ width="200" />
<text
type="string"
length="1"
@@ -635,50 +651,12 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText6"
- top_delta="11"
+ top_pad="-15"
width="10">
G
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText7"
- top_delta="11"
- width="10">
- B
- </text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText8"
- top_delta="11"
- width="10">
- I
- </text>
- <slider
- control_name="WLAmbientR"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left="259"
- name="WLAmbientR"
- top="40"
- width="200" />
<slider
control_name="WLAmbientG"
decimal_digits="2"
@@ -689,8 +667,22 @@
layout="topleft"
left_delta="0"
name="WLAmbientG"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText7"
+ top_pad="-15"
+ width="10">
+ B
+ </text>
<slider
control_name="WLAmbientB"
decimal_digits="2"
@@ -701,8 +693,22 @@
layout="topleft"
left_delta="0"
name="WLAmbientB"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText8"
+ top_pad="-15"
+ width="10">
+ I
+ </text>
<slider
control_name="WLAmbientI"
decimal_digits="2"
@@ -713,7 +719,8 @@
layout="topleft"
left_delta="0"
name="WLAmbientI"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -722,9 +729,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="WLEastAngleText"
- top_delta="-2"
+ top_pad="-10"
width="355">
East Angle
</text>
@@ -736,9 +743,9 @@
increment="0.01"
initial_value="0.0"
layout="topleft"
- left="259"
+ left_delta="13"
name="WLEastAngle"
- top="107"
+ top_pad="27"
width="200" />
<text
type="string"
@@ -762,10 +769,10 @@
initial_value="0.1"
label="Focus "
layout="topleft"
- left="494"
+ left_delta="0"
max_val="0.5"
name="WLGlowB"
- top="40"
+ top_pad="27"
width="200" />
<slider
control_name="WLGlowR"
@@ -780,7 +787,7 @@
max_val="1.99"
min_val="1"
name="WLGlowR"
- top_pad="1"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -789,9 +796,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="0"
name="SceneGammaText"
- top_delta="0"
+ top_pad="-10"
width="200">
Scene Gamma
</text>
@@ -803,11 +810,11 @@
increment="0.01"
initial_value="2.0"
layout="topleft"
- left="494"
+ left_delta="0"
max_val="10"
name="WLGamma"
- top="87"
- width="207" />
+ top_pad="27"
+ width="200" />
<text
type="string"
length="1"
@@ -815,9 +822,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="0"
name="WLStarText"
- top_delta="-1"
+ top_pad="-10"
width="355">
Star Brightness
</text>
@@ -829,17 +836,17 @@
increment="0.01"
initial_value="0"
layout="topleft"
- left="494"
+ left_delta="0"
max_val="2"
name="WLStarAlpha"
- top="122"
+ top_pad="27"
width="200" />
</panel>
<panel
border="true"
follows="left|top|right|bottom"
- height="160"
- label="Clouds"
+ height="196"
+ label="CLOUDS"
layout="topleft"
left_delta="0"
mouse_opaque="false"
@@ -867,12 +874,24 @@
halign="center"
height="16"
layout="topleft"
- left="10"
+ left_delta="0"
name="BHText"
- top="21"
+ top_pad="5"
width="10">
R
</text>
+ <slider
+ control_name="WLCloudColorR"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.7"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLCloudColorR"
+ width="200" />
<text
type="string"
length="1"
@@ -880,50 +899,12 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText2"
- top_delta="11"
+ top_pad="-15"
width="10">
G
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText3"
- top_delta="11"
- width="10">
- B
- </text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText4"
- top_delta="11"
- width="10">
- I
- </text>
- <slider
- control_name="WLCloudColorR"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.7"
- layout="topleft"
- left="24"
- name="WLCloudColorR"
- top="40"
- width="200" />
<slider
control_name="WLCloudColorG"
decimal_digits="2"
@@ -934,8 +915,22 @@
layout="topleft"
left_delta="0"
name="WLCloudColorG"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText3"
+ top_pad="-15"
+ width="10">
+ B
+ </text>
<slider
control_name="WLCloudColorB"
decimal_digits="2"
@@ -946,8 +941,22 @@
layout="topleft"
left_delta="0"
name="WLCloudColorB"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText4"
+ top_pad="-15"
+ width="10">
+ I
+ </text>
<slider
control_name="WLCloudColorI"
decimal_digits="2"
@@ -958,7 +967,8 @@
layout="topleft"
left_delta="0"
name="WLCloudColorI"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -967,9 +977,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="WLCloudColorText2"
- top_delta="-2"
+ top_pad="-10"
width="355">
Cloud XY/Density
</text>
@@ -980,12 +990,24 @@
halign="center"
height="16"
layout="topleft"
- left="10"
+ left_delta="0"
name="BHText5"
- top="87"
+ top_pad="5"
width="10">
X
</text>
+ <slider
+ control_name="WLCloudX"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.5"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLCloudX"
+ width="200" />
<text
type="string"
length="1"
@@ -993,12 +1015,24 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText6"
- top_delta="11"
+ top_pad="-15"
width="10">
Y
</text>
+ <slider
+ control_name="WLCloudY"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.5"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLCloudY"
+ width="200" />
<text
type="string"
length="1"
@@ -1006,37 +1040,13 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText7"
- top_delta="11"
+ top_pad="-15"
width="10">
D
</text>
<slider
- control_name="WLCloudX"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.5"
- layout="topleft"
- left_pad="4"
- name="WLCloudX"
- top_delta="-2"
- width="200" />
- <slider
- control_name="WLCloudY"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.5"
- layout="topleft"
- left_delta="0"
- name="WLCloudY"
- top_pad="1"
- width="200" />
- <slider
control_name="WLCloudDensity"
decimal_digits="2"
follows="left"
@@ -1046,7 +1056,8 @@
layout="topleft"
left_delta="0"
name="WLCloudDensity"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
@@ -1069,9 +1080,9 @@
increment="0.01"
initial_value="0.5"
layout="topleft"
- left="259"
+ left_delta="13"
name="WLCloudCoverage"
- top="40"
+ top_pad="27"
width="200" />
<text
type="string"
@@ -1080,9 +1091,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="WLCloudScaleText"
- top_delta="-1"
+ top_pad="-10"
width="355">
Cloud Scale
</text>
@@ -1094,10 +1105,10 @@
increment="0.01"
initial_value="1.0"
layout="topleft"
- left="259"
+ left_delta="13"
min_val="0.01"
name="WLCloudScale"
- top="75"
+ top_pad="27"
width="200" />
<text
type="string"
@@ -1106,9 +1117,9 @@
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-14"
+ left_delta="-13"
name="WLCloudDetailText"
- top_delta="-4"
+ top_pad="-10"
width="355">
Cloud Detail (XY/Density)
</text>
@@ -1119,12 +1130,24 @@
halign="center"
height="16"
layout="topleft"
- left="245"
+ left_delta="0"
name="BHText8"
- top="87"
+ top_pad="5"
width="10">
X
</text>
+ <slider
+ control_name="WLCloudDetailX"
+ decimal_digits="2"
+ follows="left"
+ height="10"
+ increment="0.01"
+ initial_value="0.5"
+ layout="topleft"
+ left_pad="3"
+ top_pad="6"
+ name="WLCloudDetailX"
+ width="200" />
<text
type="string"
length="1"
@@ -1132,37 +1155,12 @@
halign="center"
height="16"
layout="topleft"
- left_delta="0"
+ left_delta="-13"
name="BHText9"
- top_delta="11"
+ top_pad="-15"
width="10">
Y
</text>
- <text
- type="string"
- length="1"
- follows="left|top|right"
- halign="center"
- height="16"
- layout="topleft"
- left_delta="0"
- name="BHText10"
- top_delta="11"
- width="10">
- D
- </text>
- <slider
- control_name="WLCloudDetailX"
- decimal_digits="2"
- follows="left"
- height="10"
- increment="0.01"
- initial_value="0.5"
- layout="topleft"
- left_pad="4"
- name="WLCloudDetailX"
- top_delta="-2"
- width="200" />
<slider
control_name="WLCloudDetailY"
decimal_digits="2"
@@ -1173,8 +1171,22 @@
layout="topleft"
left_delta="0"
name="WLCloudDetailY"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top|right"
+ halign="center"
+ height="16"
+ layout="topleft"
+ left_delta="-13"
+ name="BHText10"
+ top_pad="-15"
+ width="10">
+ D
+ </text>
<slider
control_name="WLCloudDetailDensity"
decimal_digits="2"
@@ -1185,7 +1197,8 @@
layout="topleft"
left_delta="0"
name="WLCloudDetailDensity"
- top_pad="1"
+ left_pad="3"
+ top_pad="6"
width="200" />
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index a628e76bc0..0d4f67f94c 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -53,7 +53,7 @@
top="0"
width="380">
</flat_list_view>
- </accordion_tab>5
+ </accordion_tab>
<accordion_tab
layout="topleft"
name="3_days_ago"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:01:01 +0000