diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-23 19:59:47 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-23 19:59:47 -0500 |
| commit | 2bdf430de13577e855a7a1f400173f6cd4ab8ac6 (patch) | |
| tree | 5b0b41311e69e37949d9f9e312c0e9fcbd5b730a /indra | |
| parent | 9eb42546dc28f2a9c54a461b4ad9a02e9bf55d8f (diff) | |
small fixes for inv slurl functionality
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index c6ec25c1cb..ad3828bba6 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -80,7 +80,7 @@ public: } const std::string verb = params[1].asString(); - if (verb == "select") + //if (verb == "select") { std::vector<LLUUID> items_to_open; items_to_open.push_back(inventory_id); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b2693c799c..7eed40589b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -169,7 +169,6 @@ static const F32 LLREQUEST_PERMISSION_THROTTLE_INTERVAL = 10.0f; // seconds extern BOOL gDebugClicks; // function prototypes -void open_offer(const std::vector<LLUUID>& items, const std::string& from_name); bool check_offer_throttle(const std::string& from_name, bool check_only); //inventory offer throttle globals @@ -744,7 +743,7 @@ class LLOpenTaskOffer : public LLInventoryAddedObserver protected: /*virtual*/ void done() { - open_offer(mAdded, ""); + open_inventory_offer(mAdded, ""); mAdded.clear(); } }; |