2 files changed, 47 insertions, 29 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index fbb51e8..59c2982 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -872,7 +872,7 @@
   <key>ParticleChat</key>
   <map>
     <key>Comment</key>
-    <string>Chat target of effect beam to channel 9000</string>
+    <string>Chat target of effect beam to channel given by ParticleChatChannel</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -880,6 +880,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ParticleChatChannel</key>
+  <map>
+    <key>Comment</key>
+    <string>Channel for the ParticleChat target</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>118000</integer>
+  </map>
   <key>PersistShowLookAt</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 27a848f..204357f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3929,7 +3929,7 @@ void LLVOAvatar::idleUpdateTractorBeam()
                                 msg->nextBlockFast(_PREHASH_ChatData);
                                 msg->addStringFast(_PREHASH_Message, "stop");
                                 msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-                                msg->addS32("Channel", 9000);
+                                msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
                                 
                                 gAgent.sendReliableMessage();
                                 sBeamLastAt  =  LLVector3d::zero;
@@ -3949,53 +3949,58 @@ void LLVOAvatar::idleUpdateTractorBeam()
         if (!mBeam.isNull())
         {
                 LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+                LLViewerObject* obj_sel = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 
                 if (gAgent.mPointAt.notNull())
                 {
                         // get point from pointat effect
                         mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
 
+                        //lgg crap
                         if(gSavedSettings.getBOOL("ParticleChat"))
                         {
                                 if(sPartsNow != TRUE)
                                 {
-                                        sPartsNow = TRUE;
-                                        LLMessageSystem* msg = gMessageSystem;
-                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
-                                        msg->nextBlockFast(_PREHASH_AgentData);
-                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                        msg->nextBlockFast(_PREHASH_ChatData);
-                                        msg->addStringFast(_PREHASH_Message, "start");
-                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-                                        msg->addS32("Channel", 9000);
-                                        
-                                        gAgent.sendReliableMessage();
+                        
+                                        sPartsNow = TRUE; 
+                                        if(obj_sel){
+                                                LLMessageSystem* msg = gMessageSystem;
+                                                msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                                msg->nextBlockFast(_PREHASH_AgentData);
+                                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                                msg->nextBlockFast(_PREHASH_ChatData);
+                                                msg->addStringFast(_PREHASH_Message, "start"+obj_sel->getID().asString());
+                                                msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                                msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
+                                                
+                                                gAgent.sendReliableMessage();
+                                        }
 
                                         LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
                                 }
-                                //LLVector3d a = sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal();
-                                //if(a.length > 2)
+
                                 if( (sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal()).length() > .2)
-                                //if(sBeamLastAt!=gAgent.mPointAt->getPointAtPosGlobal())
                                 {
                                         sBeamLastAt = gAgent.mPointAt->getPointAtPosGlobal(); 
-
-                                        LLMessageSystem* msg = gMessageSystem;
-                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
-                                        msg->nextBlockFast(_PREHASH_AgentData);
-                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                        msg->nextBlockFast(_PREHASH_ChatData);
-                                        msg->addStringFast(_PREHASH_Message, llformat("<%.6f, %.6f, %.6f>",(F32)(sBeamLastAt.mdV[VX]),(F32)(sBeamLastAt.mdV[VY]),(F32)(sBeamLastAt.mdV[VZ])));
-                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-                                        msg->addS32("Channel", 9000); // *TODO: make configurable
                                         
-                                        gAgent.sendReliableMessage();
+                                        if(obj_sel){
+                                                LLMessageSystem* msg = gMessageSystem;
+                                                msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                                msg->nextBlockFast(_PREHASH_AgentData);
+                                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                                msg->nextBlockFast(_PREHASH_ChatData);
+                                                msg->addStringFast(_PREHASH_Message, "start"+obj_sel->getID().asString());
+                                                msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                                msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
+                                                
+                                                gAgent.sendReliableMessage();
+                                        }
                                 }
 
                         }
-
+                        
                         mBeam->triggerLocal();
                 }
                 else if (selection->getFirstRootObject() && 
@@ -4034,6 +4039,8 @@ void LLVOAvatar::idleUpdateTractorBeam()
                 }
         }
 }
+//</edit>
+
 
 void LLVOAvatar::idleUpdateBelowWater()
 {