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

Merge

meow-7.2.2
Eli Linden 2010-03-02 11:06:43 -08:00
parent bfd1fd9936 06b8146686
commit 15af3f0e6a
9 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lltabcontainer.cpp
View File

@ -1649,7 +1649,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
if(mCustomIconCtrlUsed)
{
LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton);
LLIconCtrl* icon_ctrl = button->getIconCtrl();
LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL;
image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0;
}
else

47
indra/newview/llappearancemgr.cpp
View File

@ -528,22 +528,29 @@ public:
LLViewerInventoryItem *item = gInventory.getItem(item_id);
LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL;
gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
if (item && linked_item)
if (linked_item)
{
LLFoundData found(linked_item->getUUID(),
linked_item->getAssetUUID(),
linked_item->getName(),
linked_item->getType(),
linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
);
found.mWearable = mWearable;
mHolder->mFoundList.push_front(found);
gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID());
if (item)
{
LLFoundData found(linked_item->getUUID(),
linked_item->getAssetUUID(),
linked_item->getName(),
linked_item->getType(),
linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID
);
found.mWearable = mWearable;
mHolder->mFoundList.push_front(found);
}
else
{
llwarns << "inventory item not found for recovered wearable" << llendl;
}
}
else
{
llwarns << "inventory item or link not found for recovered wearable" << llendl;
llwarns << "inventory link not found for recovered wearable" << llendl;
}
}
private:
@ -568,12 +575,16 @@ public:
mWearable->setItemID(item_id);
LLPointer<LLInventoryCallback> cb = new RecoveredItemLinkCB(mType,mWearable,mHolder);
mHolder->mTypesToRecover.erase(mType);
link_inventory_item( gAgent.getID(),
item_id,
LLAppearanceManager::instance().getCOF(),
itemp->getName(),
LLAssetType::AT_LINK,
cb);
llassert(itemp);
if (itemp)
{
link_inventory_item( gAgent.getID(),
item_id,
LLAppearanceManager::instance().getCOF(),
itemp->getName(),
LLAssetType::AT_LINK,
cb);
}
}
private:
LLWearableHoldingPattern* mHolder;

4
indra/newview/llpanelclassified.cpp
View File

@ -1155,6 +1155,8 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo()
, mInfoLoaded(false)
, mScrollingPanel(NULL)
, mScrollContainer(NULL)
, mScrollingPanelMinHeight(0)
, mScrollingPanelWidth(0)
{
}
@ -1292,11 +1294,13 @@ void LLPanelClassifiedInfo::resetControls()
{
childSetEnabled("edit_btn", TRUE);
childSetVisible("edit_btn", TRUE);
childSetVisible("auto_renew", TRUE);
}
else
{
childSetEnabled("edit_btn", FALSE);
childSetVisible("edit_btn", FALSE);
childSetVisible("auto_renew", FALSE);
}
}

2
indra/newview/llscriptfloater.cpp
View File

@ -135,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id)
void LLScriptFloater::getAllowedRect(LLRect& rect)
{
rect = gViewerWindow->getWorldViewRectRaw();
rect = gViewerWindow->getWorldViewRectScaled();
}
void LLScriptFloater::createForm(const LLUUID& notification_id)

10
indra/newview/llviewercamera.cpp
View File

@ -338,7 +338,12 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
{
// make a tiny little viewport
// anything drawn into this viewport will be "selected"
GLint* viewport = (GLint*) gGLViewport;
GLint viewport[4];
viewport[0] = gViewerWindow->getWorldViewRectRaw().mLeft;
viewport[1] = gViewerWindow->getWorldViewRectRaw().mBottom;
viewport[2] = gViewerWindow->getWorldViewRectRaw().getWidth();
viewport[3] = gViewerWindow->getWorldViewRectRaw().getHeight();
proj_mat = gl_pick_matrix(x+width/2.f, y_from_bot+height/2.f, (GLfloat) width, (GLfloat) height, viewport);
@ -405,6 +410,9 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
if (for_selection && (width > 1 || height > 1))
{
// NB: as of this writing, i believe the code below is broken (doesn't take into account the world view, assumes entire window)
// however, it is also unused (the GL matricies are used for selection, (see LLCamera::sphereInFrustum())) and so i'm not
// comfortable hacking on it.
calculateFrustumPlanesFromWindow((F32)(x - width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
(F32)(y_from_bot - height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f,
(F32)(x + width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,

1
indra/newview/llviewermessage.cpp
View File

@ -207,6 +207,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
LLNotificationsUtil::add("FriendshipDeclinedByMe",
notification["substitutions"], payload);
}
// fall-through
case 2: // Send IM - decline and start IM session
{
// decline

20
indra/newview/skins/default/xui/en/panel_classified_info.xml
View File

@ -136,16 +136,6 @@
top_pad="5"
v_pad="0"
value="[category]" />
<check_box
enabled="false"
height="16"
label="Auto renew each week"
layout="topleft"
left="10"
name="auto_renew"
top_pad="5"
v_pad="0"
width="290" />
<text_editor
allow_scroll="false"
bg_visible="false"
@ -161,6 +151,16 @@
tool_tip="Price for listing."
v_pad="0"
width="105" />
<check_box
enabled="false"
height="16"
label="Auto renew each week"
layout="topleft"
left="10"
name="auto_renew"
top_pad="5"
v_pad="0"
width="290" />
<text_editor
allow_html="true"
allow_scroll="false"

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

@ -64,6 +64,7 @@
layout="topleft"
left="103"
name="description"
textbox.max_length="1024"
textbox.show_context_menu="false"
top_pad="0"
width="178"

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

@ -64,6 +64,7 @@
layout="topleft"
left="103"
name="picture_descr"
textbox.max_length="1024"
textbox.show_context_menu="false"
top_pad="0"
width="178"