diff options
| author | callum <none@none> | 2011-10-12 12:56:49 -0700 | 
|---|---|---|
| committer | callum <none@none> | 2011-10-12 12:56:49 -0700 | 
| commit | 64ae4d14627a81dfbd6bbe25273e32bf1a1ad8b6 (patch) | |
| tree | 2da4038c82ab4a911714bf58738f1d506da668a4 | |
| parent | ed53295cb3137f757d4d120f84f5d22c170ae823 (diff) | |
| parent | 5f609becd37f0b3483892b211fa82ca72ddfa86a (diff) | |
Merge with head
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 | 
1 files changed, 0 insertions, 2 deletions
| diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index da1b149b59..0cbbfae002 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -373,8 +373,6 @@ void set_underclothes_menu_options()  void init_menus()  { -	S32 top = gViewerWindow->getRootView()->getRect().getHeight(); -  	// Initialize actions  	initialize_menus(); | 
