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

merge

master
Mark Palange (Mani) 2010-02-05 13:20:16 -08:00
parent 90be737898 4c4925e8af
commit 02511c4171
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerobject.cpp
View File

@ -4019,9 +4019,14 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const
{
LLVector3 position_agent;
LLQuaternion rot;
LLViewerObject* avatar_parent = NULL;
LLViewerObject* root_edit = (LLViewerObject*)getRootEdit();
LLViewerObject* avatar_parent = (LLViewerObject*)root_edit->getParent();
if (avatar_parent && avatar_parent->isAvatar() && root_edit->mDrawable.notNull())
if (root_edit)
{
avatar_parent = (LLViewerObject*)root_edit->getParent();
}
if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull())
{
LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();

8
indra/newview/llvoavatarself.cpp
View File

@ -510,8 +510,12 @@ BOOL LLVOAvatarSelf::buildMenus()
LLVOAvatarSelf::~LLVOAvatarSelf()
{
gAgent.setAvatarObject(NULL);
gAgentWearables.setAvatarObject(NULL);
// gAgents pointer might have been set to a different Avatar Self, don't get rid of it if so.
if (gAgent.getAvatarObject() == this)
{
gAgent.setAvatarObject(NULL);
gAgentWearables.setAvatarObject(NULL);
}
delete mScreenp;
mScreenp = NULL;
}

2
indra/newview/skins/default/xui/ja/floater_buy_currency.xml
View File

@ -46,7 +46,7 @@
L$ [AMT]
</text>
<text name="currency_links">
[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP payment method] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP exchange rate]
[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP 支払方法] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP 通貨] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP 換算レート]
</text>
<text name="exchange_rate_note">
金額を再入力して最新換算レートを確認します。