diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
| commit | 53b947e0397d6b88fdc6c0a10144e5a6d02a67d3 (patch) | |
| tree | 38c94f216386ba6653e8152d9db0198807f4f2cc /indra/newview/llinventoryfunctions.h | |
| parent | ed7963bad14abd628fa60d0d5baf357f1858c48c (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge from viewer release.
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 8aa8370f91..649db4032d 100755 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -461,9 +461,9 @@ struct LLInventoryAction static void removeItemFromDND(LLFolderView* root); private: - static void buildMarketplaceFolders(LLFolderView* root); - static void updateMarketplaceFolders(); - static std::list<LLUUID> sMarketplaceFolders; // Marketplace folders that will need update once the action is completed + static void buildMarketplaceFolders(LLFolderView* root); + static void updateMarketplaceFolders(); + static std::list<LLUUID> sMarketplaceFolders; // Marketplace folders that will need update once the action is completed }; |