STORM-1182: XUI Preview Tool fails to load XMLs from indra/newview/skins (Ported Vadim's Linux fix to Mac)


Submitter:	Boroondas Gupte	Reviewers
Branch:		Groups:	viewer
Bugs:	STORM-1182	People:
Change Number:	None	Repository:	viewer-development

Description:

Just looked at Vadim's fix for Linux in lldir_linux.cpp (also in this review request's diff) and applied analogous changes to lldir_mac.cpp, in hope that this would fix the same issue on Mac, too:
* renamed indra_pos to build_dir_pose (just for consistency. This should not have any effect.)
* search for "/build-darwin-" rather than "/indra" within mExecutableDir (The new build dir prefix is taken from .hgignore, in the hope that is up to date.)

Testing Done:

None, as I don't have a mac.

Expand All

Looks good, thanks.

One note that applies to my patch as well: rfind() seems to fit better than find() in this case.

Boroondas Gupte April 25, 2011, 12:15 p.m. (April 25, 2011, 12:15 p.m.)

Using string::rfind instead of string::find would avoid problems if someone checks out the source to a path already containing "/build-darwin-" or "/build-linux-", I guess?

Vadim ProductEngine April 25, 2011, 2:32 p.m. (April 25, 2011, 2:32 p.m.)
```
Yep, that's what I meant.
```

Diff
- added Diff r2

Description:

Use string::rfind instead of string::find, so last occurrence of build dir prefix will be matched.

You have a pending review.

Other reviews

Your comment

Review Board 1.6.11

This change has been marked as submitted.