phoenix-firestorm-lgpl-premerge / files

     1.1 --- a/indra/newview/fslslbridge.cpp	Sun Apr 24 00:35:34 2016 +0200
     1.2 +++ b/indra/newview/fslslbridge.cpp	Wed Apr 27 01:00:27 2016 +0200
     1.3 @@ -768,7 +768,7 @@
     1.4  			LL_WARNS("FSLSLBridge") << "Bridge container isn't in the correct inventory location. Detaching it and aborting." << LL_ENDL;
     1.5  			if (mBridgeCreating)
     1.6  			{
     1.7 -				report_to_nearby_chat(LLTrans::getString("fs_bridge_failure_attach_wrong_location"));
     1.8 +				report_to_nearby_chat(LLTrans::getString("fsbridge_failure_attach_wrong_location"));
     1.9  				setBridgeCreating(false); //in case we interrupted the creation
    1.10  			}
    1.11  			return;