diff options
| -rwxr-xr-x | indra/develop.py | 4 | ||||
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelappearancetab.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/develop.py b/indra/develop.py index 79baa613ad..05ad12f20e 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -578,12 +578,16 @@ class WindowsSetup(PlatformSetup): # devenv.com is CLI friendly, devenv.exe... not so much. return ('"%sdevenv.com" %s.sln /build %s' % (self.find_visual_studio(), self.project_name, self.build_type)) + #return ('devenv.com %s.sln /build %s' % + # (self.project_name, self.build_type)) def run(self, command, name=None, retry_on=None, retries=1): '''Run a program. If the program fails, raise an exception.''' while retries: retries = retries - 1 + print "develop.py tries to run:", command ret = os.system(command) + print "got ret", ret, "from", command if ret: if name is None: name = command.split(None, 1)[0] diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index ab518adadd..6cb96d1336 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -2137,7 +2137,7 @@ void LLLibraryOutfitsFetch::outfitsDone(void) void LLLibraryOutfitsFetch::contentsDone(void) { - for(S32 i = 0; i < mOutfits.size(); ++i) + for(S32 i = 0; i < (S32)mOutfits.size(); ++i) { // First, make a folder in the My Outfits directory. const LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS); diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h index 8a9ba66ec0..c2f8dbd074 100644 --- a/indra/newview/llpanelappearancetab.h +++ b/indra/newview/llpanelappearancetab.h @@ -53,12 +53,8 @@ public: bool isTabVisible(); // Check if parent TabContainer is visible. - void setPanelAppearanceButtons(LLPanelAppearance* panel); - protected: - LLButton* mWearBtn; - LLButton* mEditBtn; LLPanelAppearance* mParent; }; |