Merged revision(s) 6894 from branches/ja2_source_official_2014:

Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Laptop/IMP Disability Trait.cpp

@@ -412,12 +412,13 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
 		btn->uiFlags|=(BUTTON_CLICKED_ON);
 
 		//if we are just reviewing the page
-		if( iCurrentProfileMode == IMP__FINISH )
-		{
-			//go back tot he done screen
-			iCurrentImpPage = IMP_FINISH;
-		}
-		else
+		//if( iCurrentProfileMode == IMP__FINISH )
+		//{
+			//go back to the done screen
+		iCurrentImpPage = IMP_PREJUDICE;
+		fButtonPendingFlag = TRUE;
+		//}
+		/*else
 		{
 			iCurrentImpPage = IMP_PREJUDICE;
 
@@ -431,7 +432,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
 				else
 					iCurrentProfileMode = IMP__FINISH;
 			}
-		}
+		}*/
 	}
 }