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

svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

meow-7.2.2
Josh Bell 2007-01-15 18:49:02 +00:00
parent dbf45ad429
commit aeb6d0c93c
20 changed files with 63 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/message.h
View File

@ -731,7 +731,7 @@ private:
static F32 mTimeDecodesSpamThreshold; // If mTimeDecodes is on, all this many seconds for each msg decode before spamming
static BOOL mTimeDecodes; // Measure time for all message decodes if TRUE;
void LLMessageSystem::init(); // ctor shared initialisation.
void init(); // ctor shared initialisation.
};

2
indra/llrender/llimagegl.h
View File

@ -150,7 +150,7 @@ protected:
// STATICS
public:
static std::set<LLImageGL*> LLImageGL::sImageList;
static std::set<LLImageGL*> sImageList;
static S32 sCount;
static F32 sLastFrameTime;

4
indra/llui/llfloater.h
View File

@ -288,8 +288,8 @@ public:
void getMinimizePosition( S32 *left, S32 *bottom);
void restoreAll(); // un-minimize all floaters
typedef std::set<LLView*> skip_list_t;
void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());
void LLFloaterView::popVisibleAll(const skip_list_t& skip_list = skip_list_t());
void pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());
void popVisibleAll(const skip_list_t& skip_list = skip_list_t());
void setCycleMode(BOOL mode);
BOOL getCycleMode();

9
indra/llui/llmenugl.cpp
View File

@ -528,8 +528,8 @@ void LLMenuItemGL::draw( void )
}
}
// underline "jump" key
if (getMenu()->jumpKeysActive())
// underline "jump" key only when keyboard navigation has been initiated
if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
{
LLString upper_case_label = mLabel.getString();
LLString::toUpper(upper_case_label);
@ -1792,8 +1792,8 @@ void LLMenuItemBranchDownGL::draw( void )
LLFontGL::HCENTER, LLFontGL::BOTTOM, font_style );
// underline navigation key
if (getMenu()->jumpKeysActive())
// underline navigation key only when keyboard navigation has been initiated
if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
{
LLString upper_case_label = mLabel.getString();
LLString::toUpper(upper_case_label);
@ -4281,6 +4281,7 @@ BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask )
((LLMenuItemGL*)viewp)->doIt();
LLMenuGL::setKeyboardMode(FALSE);
}
LLMenuGL::setKeyboardMode(FALSE);
}
}

2
indra/llui/llmenugl.h
View File

@ -410,7 +410,7 @@ public:
virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
virtual void setVisible(BOOL visible);
virtual BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask);
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
LLMenuGL* getChildMenuByName(const LLString& name, BOOL recurse) const;

2
indra/lscript/lscript_library/lscript_library.cpp
View File

@ -208,7 +208,7 @@ void LLScriptLibrary::init()
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llCollisionSprite", NULL, "s", "llCollisionSprite(string impact_sprite)\nSuppress default collision sprites, replace default impact sprite with impact_sprite (empty string to just suppress)"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAnimation", "s", "k", "string llGetAnimation(key id)\nGet the currently playing locomotion animation for avatar id"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llResetScript", NULL, NULL, "llResetScript()\nResets the script"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llMessageLinked", NULL, "iisk", "llMessageLinked(integer linknum, integer num, string str, key id)\nSends num, str, and id to members of the link set(LINK_SET sends to all tasks,\nLINK_ALL_OTHERS to all other tasks,\nLINK_ALL_CHILDREN to all children"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llMessageLinked", NULL, "iisk", "llMessageLinked(integer linknum, integer num, string str, key id)\nSends num, str, and id to members of the link set (LINK_ROOT sends to root task in a linked set,\nLINK_SET sends to all tasks,\nLINK_ALL_OTHERS to all other tasks,\nLINK_ALL_CHILDREN to all children,\nLINK_THIS to the task the script it is in)"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llPushObject", NULL, "kvvi", "llPushObject(key id, vector impulse, vector ang_impulse, integer local)\nApplies impulse and ang_impulse to object id"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llPassCollisions", NULL, "i", "llPassCollisions(integer pass)\nif pass == TRUE, collisions are passed from children on to parents (default is FALSE)"));
addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetScriptName", "s", NULL, "llGetScriptName()\nReturns the script name"));

1
indra/newview/gpu_table.txt
View File

@ -75,6 +75,7 @@ NVIDIA GeForce 7300 .*NVIDIA.*GeForce 73.* 3
NVIDIA GeForce 7600 .*NVIDIA.*GeForce 76.* 3
NVIDIA GeForce 7800 .*NVIDIA.*GeForce 78.* 3
NVIDIA GeForce 7900 .*NVIDIA.*GeForce 79.* 3
NVIDIA GeForce 8800 .*NVIDIA.*GeForce 88.* 3
NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 1
NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 1
NVIDIA GeForce FX 5500 .*NVIDIA.*GeForce FX 55.* 1

9
indra/newview/llchatbar.cpp
View File

@ -132,6 +132,11 @@ BOOL LLChatBar::postBuild()
childSetAction("Say", onClickSay, this);
childSetAction("Shout", onClickShout, this);
childSetCommitCallback("Gesture", onCommitGesture, this);
LLButton * sayp = static_cast<LLButton*>(getChildByName("Say"));
if(sayp)
{
setDefaultBtn(sayp);
}
return TRUE;
}
@ -271,8 +276,8 @@ void LLChatBar::refresh()
gAgent.stopTyping();
}
childSetEnabled("Say", mInputEditor->getText().size());
childSetEnabled("Shout", mInputEditor->getText().size());
childSetEnabled("Say", mInputEditor->getText().size() > 0);
childSetEnabled("Shout", mInputEditor->getText().size() > 0);
}

2
indra/newview/lldynamictexture.h
View File

@ -60,7 +60,7 @@ protected:
LLCoordGL mOrigin;
LLCamera mCamera;
static LLLinkedList<LLDynamicTexture> LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ];
static LLLinkedList<LLDynamicTexture> sInstances[ LLDynamicTexture::ORDER_COUNT ];
static S32 sNumRenders;
};

22
indra/newview/llfolderview.cpp
View File

@ -3242,18 +3242,20 @@ void LLFolderView::removeSelectedItems( void )
{
new_selection = item_to_delete->getPreviousOpenNode(FALSE);
}
if (new_selection)
{
setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this));
}
else
{
setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this));
}
if(parent)
{
parent->removeItem(item_to_delete);
if (parent->removeItem(item_to_delete))
{
// change selection on successful delete
if (new_selection)
{
setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this));
}
else
{
setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this));
}
}
}
arrangeAll();
}

1
indra/newview/llinventorybridge.cpp
View File

@ -676,6 +676,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
LLInventoryObject* obj = model->getObject(mUUID);
if(!obj) return;
obj->removeFromServer();
LLPreview::hide(mUUID);
model->deleteObject(mUUID);
model->notifyObservers();
}

4
indra/newview/lljoystickbutton.h
View File

@ -75,7 +75,7 @@ public:
virtual void onHeldDown();
static LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
};
@ -96,7 +96,7 @@ public:
virtual void onHeldDown();
virtual void onMouseUp();
static LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
};

2
indra/newview/llpanelcontents.h
View File

@ -21,7 +21,7 @@ class LLSpinCtrl;
class LLPanelContents : public LLPanel
{
public:
virtual BOOL LLPanelContents::postBuild();
virtual BOOL postBuild();
LLPanelContents(const std::string& name);
virtual ~LLPanelContents();

7
indra/newview/llpreview.cpp
View File

@ -286,12 +286,7 @@ void LLPreview::hide(const LLUUID& item_uuid)
if(found_it != LLPreview::sInstances.end())
{
LLPreview* instance = found_it->second;
if( instance->getParent() )
{
instance->getParent()->removeChild( instance );
}
delete instance;
instance->close();
}
}

9
indra/newview/llpreviewtexture.cpp
View File

@ -157,9 +157,12 @@ void LLPreviewTexture::init()
{
LLInventoryItem* item = getItem();
childSetCommitCallback("desc", LLPreview::onText, this);
childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
if (item)
{
childSetCommitCallback("desc", LLPreview::onText, this);
childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
}
}
}

9
indra/newview/llselectmgr.cpp
View File

@ -3899,6 +3899,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
return;
}
BOOL build_mode = gToolMgr->inEdit();
// Special case: Attach to default location for this object.
if (0 == attachment_point)
{
@ -3908,6 +3909,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
packObjectIDAndRotation,
&attachment_point,
SEND_ONLY_ROOTS );
if (!build_mode)
{
deselectAll();
}
}
else
{
@ -3945,6 +3950,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
packObjectIDAndRotation,
&attachment_point,
SEND_ONLY_ROOTS );
if (!build_mode)
{
deselectAll();
}
}
}
}

2
indra/newview/llviewermenu.cpp
View File

@ -6828,7 +6828,6 @@ void near_attach_object(BOOL success, void *user_data)
}
gSelectMgr->sendAttach(attachment_id);
gSelectMgr->deselectTransient();
}
class LLObjectAttachToAvatar : public view_listener_t
@ -6866,6 +6865,7 @@ void confirm_replace_attachment(S32 option, void* user_data)
{
if (option == 0/*YES*/)
{
gSelectMgr->convertTransient();
LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject();
if (selectedObject)
{

2
indra/newview/llviewertexteditor.cpp
View File

@ -386,7 +386,7 @@ void LLEmbeddedItems::markSaved()
class LLTextCmdInsertEmbeddedItem : public LLTextCmd
{
public:
LLTextCmdInsertEmbeddedItem::LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item )
LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item )
: LLTextCmd(pos, FALSE),
mExtCharValue(0)
{

9
indra/newview/llviewerwindow.cpp
View File

@ -899,6 +899,12 @@ void LLViewerWindow::handleFocusLost(LLWindow *window)
}
gFocusMgr.setMouseCapture( NULL, NULL );
if (gMenuBarView)
{
// stop ALT-key access to menu
gMenuBarView->resetMenuTrigger();
}
// restore mouse cursor
gViewerWindow->showCursor();
gViewerWindow->getWindow()->setMouseClipping(FALSE);
@ -2671,8 +2677,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
if (gParcelMgr
&& !LLFloaterLand::floaterVisible()
&& !LLFloaterBuyLand::isOpen()
&& (!gFloaterTools || !gFloaterTools->getVisible())
&& !gToolMgr)
&& (!gFloaterTools || !gFloaterTools->getVisible()))
{
gParcelMgr->deselectLand();
}

4
indra/newview/llwearable.h
View File

@ -112,8 +112,8 @@ private:
LLPtrSkipMap<S32, F32*> mVisualParamMap; // maps visual param id to weight
LLPtrSkipMap<S32, LLUUID*> mTEMap; // maps TE to Image ID
static const char* LLWearable::sTypeName[ WT_COUNT ];
static const char* LLWearable::sTypeLabel[ WT_COUNT ];
static const char* sTypeName[ WT_COUNT ];
static const char* sTypeLabel[ WT_COUNT ];
};
#endif // LL_LLWEARABLE_H