diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-01 18:04:39 -0700 | 
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-01 18:04:39 -0700 | 
| commit | 3ce04bdcc7dedb1ce0b2c9db75fe22439cd24132 (patch) | |
| tree | c518eec2291302b8e48376588adca98ad075eb8e /indra | |
| parent | 65d28f8aeac84b4f80a15069b4212956d08aba66 (diff) | |
Comment and line ending repair
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llgesturelistener.cpp | 52 | 
1 files changed, 26 insertions, 26 deletions
| diff --git a/indra/newview/llgesturelistener.cpp b/indra/newview/llgesturelistener.cpp index f682700746..22b7d233c5 100644 --- a/indra/newview/llgesturelistener.cpp +++ b/indra/newview/llgesturelistener.cpp @@ -39,8 +39,8 @@ LLGestureListener::LLGestureListener()  {
      add("getActiveGestures",
          "Return information about the agent's available gestures [\"reply\"]:\n"
 -        "[\"gestures\"]: list of gestures.  This is a dictionary with UUID strings as keys\n"
 -		"  and the following values:\n"
 +        "[\"gestures\"]: a dictionary with UUID strings as keys\n"
 +		"  and the following dict values for each entry:\n"
  		"     [\"name\"]: name of the gesture, may be empty\n"
  		"     [\"trigger\"]: trigger string used to invoke via user chat, may be empty\n"
  		"     [\"playing\"]: true or false indicating the playing state",
 @@ -50,7 +50,7 @@ LLGestureListener::LLGestureListener()  		"[\"id\"]: UUID of the gesture to query.  Returns True or False in [\"playing\"] value of the result",
          &LLGestureListener::isGesturePlaying);
  	add("startGesture",
 -		"[\"id\"]: UUID of the gesture to start play",
 +		"[\"id\"]: UUID of the gesture to start playing",
          &LLGestureListener::startGesture);
  	add("stopGesture",
  		"[\"id\"]: UUID of the gesture to stop",
 @@ -64,23 +64,23 @@ void LLGestureListener::getActiveGestures(const LLSD& event_data) const  	LLSD reply = LLSD::emptyMap();
  	LLSD gesture_map = LLSD::emptyMap();
 -	const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures(); - -	// Scan active gesture map and get all the names -	LLGestureMgr::item_map_t::const_iterator it; -	for (it = active_gestures.begin(); it != active_gestures.end(); ++it) -	{ -		LLMultiGesture* gesture = (*it).second; -		if (gesture) -		{	// Add an entry to the result map with the LLUUID as key with a map containing data -			LLSD info = LLSD::emptyMap(); -			info["name"] = (LLSD::String) gesture->mName; -			info["trigger"] = (LLSD::String) gesture->mTrigger; -			info["playing"] = (LLSD::Boolean) gesture->mPlaying; - -			gesture_map[(*it).first.asString()] = info; -		} -	} +	const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures();
 +
 +	// Scan active gesture map and get all the names
 +	LLGestureMgr::item_map_t::const_iterator it;
 +	for (it = active_gestures.begin(); it != active_gestures.end(); ++it)
 +	{
 +		LLMultiGesture* gesture = (*it).second;
 +		if (gesture)
 +		{	// Add an entry to the result map with the LLUUID as key with a map containing data
 +			LLSD info = LLSD::emptyMap();
 +			info["name"] = (LLSD::String) gesture->mName;
 +			info["trigger"] = (LLSD::String) gesture->mTrigger;
 +			info["playing"] = (LLSD::Boolean) gesture->mPlaying;
 +
 +			gesture_map[(*it).first.asString()] = info;
 +		}
 +	}
  	reply["gestures"] = gesture_map;
  	sendReply(reply, event_data);
 @@ -139,12 +139,12 @@ void LLGestureListener::startOrStopGesture(LLSD const & event_data, bool start)  		{
  			if (start)
  			{
 -				LLGestureMgr::instance().playGesture(gesture_id); -			} -			else -			{ -				LLGestureMgr::instance().stopGesture(gesture_id); -			} +				LLGestureMgr::instance().playGesture(gesture_id);
 +			}
 +			else
 +			{
 +				LLGestureMgr::instance().stopGesture(gesture_id);
 +			}
  		}
  		else
  		{
 | 
