diff options
author | McCabe Maxsted | 2010-08-29 04:05:22 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-29 04:05:22 -0700 |
commit | 2eef1ebb15b900145cc47bc89c4c7ad95a5f6233 (patch) | |
tree | ac3c44c7c549fafaebd702de9aae18b586057256 /linden/indra/newview/llinventorybridge.cpp | |
parent | Added author info to local texture files (diff) | |
download | meta-impy-2eef1ebb15b900145cc47bc89c4c7ad95a5f6233.zip meta-impy-2eef1ebb15b900145cc47bc89c4c7ad95a5f6233.tar.gz meta-impy-2eef1ebb15b900145cc47bc89c4c7ad95a5f6233.tar.bz2 meta-impy-2eef1ebb15b900145cc47bc89c4c7ad95a5f6233.tar.xz |
Compile fixes for windlight notecards on windows
Diffstat (limited to 'linden/indra/newview/llinventorybridge.cpp')
-rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 712d2fe..bf2d898 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
@@ -823,16 +823,6 @@ void LLItemBridge::selectItem() | |||
823 | { | 823 | { |
824 | item->fetchFromServer(); | 824 | item->fetchFromServer(); |
825 | } | 825 | } |
826 | |||
827 | if (item && item->isComplete()) | ||
828 | { | ||
829 | bool is_windlight = (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0); | ||
830 | if(is_windlight) | ||
831 | { | ||
832 | LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID); | ||
833 | } | ||
834 | } | ||
835 | |||
836 | } | 826 | } |
837 | 827 | ||
838 | void LLItemBridge::restoreItem() | 828 | void LLItemBridge::restoreItem() |
@@ -3065,7 +3055,6 @@ void LLNotecardBridge::openItem() | |||
3065 | LLViewerInventoryItem* item = getItem(); | 3055 | LLViewerInventoryItem* item = getItem(); |
3066 | if (item) | 3056 | if (item) |
3067 | { | 3057 | { |
3068 | bool is_windlight = (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0); | ||
3069 | if(isSkySetting()) | 3058 | if(isSkySetting()) |
3070 | { | 3059 | { |
3071 | LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID); | 3060 | LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID); |