OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Formatting cleanup.

trunk
Jeff Ames 2009-07-23 15:32:11 +00:00
parent b73edc3d7a
commit a133e83f3a
10 changed files with 173 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/IClientAPI.cs
View File

@ -129,7 +129,7 @@ namespace OpenSim.Framework
public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient); public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
public delegate void UpdatePrimSingleRotationPosition( uint localID, Quaternion rot, Vector3 pos, IClientAPI remoteClient); public delegate void UpdatePrimSingleRotationPosition(uint localID, Quaternion rot, Vector3 pos, IClientAPI remoteClient);
public delegate void UpdatePrimGroupRotation(uint localID, Vector3 pos, Quaternion rot, IClientAPI remoteClient); public delegate void UpdatePrimGroupRotation(uint localID, Vector3 pos, Quaternion rot, IClientAPI remoteClient);
@ -140,7 +140,6 @@ namespace OpenSim.Framework
bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters,
bool CopyRotates); bool CopyRotates);
public delegate void StatusChange(bool status); public delegate void StatusChange(bool status);
public delegate void NewAvatar(IClientAPI remoteClient, UUID agentID, bool status); public delegate void NewAvatar(IClientAPI remoteClient, UUID agentID, bool status);
@ -151,8 +150,7 @@ namespace OpenSim.Framework
public delegate void AgentSit(IClientAPI remoteClient, UUID agentID); public delegate void AgentSit(IClientAPI remoteClient, UUID agentID);
public delegate void AvatarPickerRequest(IClientAPI remoteClient, UUID agentdata, UUID queryID, string UserQuery public delegate void AvatarPickerRequest(IClientAPI remoteClient, UUID agentdata, UUID queryID, string UserQuery);
);
public delegate void GrabObject( public delegate void GrabObject(
uint localID, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs); uint localID, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs);
@ -161,8 +159,7 @@ namespace OpenSim.Framework
uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs); uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs);
public delegate void MoveObject( public delegate void MoveObject(
UUID objectID, Vector3 offset, Vector3 grapPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs UUID objectID, Vector3 offset, Vector3 grapPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs);
);
public delegate void SpinStart(UUID objectID, IClientAPI remoteClient); public delegate void SpinStart(UUID objectID, IClientAPI remoteClient);
public delegate void SpinObject(UUID objectID, Quaternion rotation, IClientAPI remoteClient); public delegate void SpinObject(UUID objectID, Quaternion rotation, IClientAPI remoteClient);

2
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
if ( Context != requestcontext ) if (Context != requestcontext)
{ {
m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context"); m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context");
response["str_response_string"] = ""; response["str_response_string"] = "";

4
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
{ {
Hashtable response = new Hashtable(); Hashtable response = new Hashtable();
string domain = (string) request["domain"]; string domain = (string) request["domain"];
if ( domain != Realm ) { if (domain != Realm) {
response["content_type"] = "text/xml"; response["content_type"] = "text/xml";
response["keepalive"] = false; response["keepalive"] = false;
response["int_response_code"] = 200; response["int_response_code"] = 200;
@ -50,7 +50,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
} else { } else {
m_log.DebugFormat("[FreeSwitchDirectory] HandleDirectoryRequest called with {0}",request.ToString()); m_log.DebugFormat("[FreeSwitchDirectory] HandleDirectoryRequest called with {0}",request.ToString());
// information in the request we might be interested in // information in the request we might be interested in
// Request 1 sip_auth for users account // Request 1 sip_auth for users account
@ -226,7 +225,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
return response; return response;
} }
private Hashtable HandleLocateUser(String Realm, Hashtable request) private Hashtable HandleLocateUser(String Realm, Hashtable request)
{ {
m_log.Info("[FreeSwitchDirectory] HandleLocateUser called"); m_log.Info("[FreeSwitchDirectory] HandleLocateUser called");

4
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
View File

@ -924,9 +924,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
// Bug in Vivox Server r2978 where count returns 0 // Bug in Vivox Server r2978 where count returns 0
// Found by Adam // Found by Adam
if(channels == 0) if (channels == 0)
{ {
for(int j=0;j<100;j++) for (int j=0;j<100;j++)
{ {
string tmpId; string tmpId;
if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.id", j, out tmpId)) if (!XmlFind(resp, "response.level0.channel-search.channels.channels.level4.id", j, out tmpId))

1
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
View File

@ -743,7 +743,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
return groupID; return groupID;
} }
public GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID groupID) public GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID groupID)

2
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -181,7 +181,7 @@ namespace OpenSim.Region.Physics.Manager
/// <param name="direction">Direction of the ray</param> /// <param name="direction">Direction of the ray</param>
/// <param name="length">Length of ray in meters</param> /// <param name="length">Length of ray in meters</param>
/// <param name="retMethod">Method to call when the raycast is complete</param> /// <param name="retMethod">Method to call when the raycast is complete</param>
public virtual void RaycastWorld( Vector3 position, Vector3 direction, float length, RaycastCallback retMethod) public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
{ {
if (retMethod != null) if (retMethod != null)
retMethod(false, Vector3.Zero, 0, 999999999999f); retMethod(false, Vector3.Zero, 0, 999999999999f);

4
OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private List<ContactResult> m_contactResults = new List<ContactResult>(); private List<ContactResult> m_contactResults = new List<ContactResult>();
public ODERayCastRequestManager( OdeScene pScene) public ODERayCastRequestManager(OdeScene pScene)
{ {
m_scene = pScene; m_scene = pScene;
nearCallback = near; nearCallback = near;
@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// Find closest contact and object. // Find closest contact and object.
lock (m_contactResults) lock (m_contactResults)
{ {
foreach(ContactResult cResult in m_contactResults) foreach (ContactResult cResult in m_contactResults)
{ {
if (Vector3.Distance(req.Origin, cResult.Pos) < Vector3.Distance(req.Origin, closestcontact)) if (Vector3.Distance(req.Origin, cResult.Pos) < Vector3.Distance(req.Origin, closestcontact))
{ {

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -9023,12 +9023,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Regex r = new Regex(authregex); Regex r = new Regex(authregex);
int[] gnums = r.GetGroupNumbers(); int[] gnums = r.GetGroupNumbers();
Match m = r.Match(url); Match m = r.Match(url);
if ( m.Success ) { if (m.Success) {
for (int i = 1; i < gnums.Length; i++) { for (int i = 1; i < gnums.Length; i++) {
System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
CaptureCollection cc = g.Captures; CaptureCollection cc = g.Captures;
} }
if ( m.Groups.Count == 5 ) { if (m.Groups.Count == 5) {
httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
url = m.Groups[1].ToString() + m.Groups[4].ToString(); url = m.Groups[1].ToString() + m.Groups[4].ToString();
} }