diff options
author | Adam Frisby | 2008-04-29 14:04:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-29 14:04:55 +0000 |
commit | 375163a6fece8b3a57c7555246abe8338223a599 (patch) | |
tree | 163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/JId.cs | |
parent | Patch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff) | |
download | opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2 opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz |
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to 'OpenSim/Framework/JId.cs')
-rw-r--r-- | OpenSim/Framework/JId.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/JId.cs b/OpenSim/Framework/JId.cs index dac4838..00e8ef1 100644 --- a/OpenSim/Framework/JId.cs +++ b/OpenSim/Framework/JId.cs | |||
@@ -31,15 +31,15 @@ namespace OpenSim.Framework | |||
31 | { | 31 | { |
32 | public class JId | 32 | public class JId |
33 | { | 33 | { |
34 | public string resource = String.Empty; | ||
34 | public string ServerIP = String.Empty; | 35 | public string ServerIP = String.Empty; |
35 | public int ServerPort = 0; | 36 | public int ServerPort = 0; |
36 | public string username = String.Empty; | 37 | public string username = String.Empty; |
37 | public string resource = String.Empty; | ||
38 | 38 | ||
39 | public JId() | 39 | public JId() |
40 | { | 40 | { |
41 | |||
42 | } | 41 | } |
42 | |||
43 | public JId(string sJId) | 43 | public JId(string sJId) |
44 | { | 44 | { |
45 | // user@address:port/resource | 45 | // user@address:port/resource |
@@ -53,14 +53,13 @@ namespace OpenSim.Framework | |||
53 | string[] resourcesplit = serversplit[1].Split('/'); | 53 | string[] resourcesplit = serversplit[1].Split('/'); |
54 | 54 | ||
55 | ServerPort = Convert.ToInt32(resourcesplit[0]); | 55 | ServerPort = Convert.ToInt32(resourcesplit[0]); |
56 | 56 | ||
57 | if (resourcesplit.GetUpperBound(0) == 2) | 57 | if (resourcesplit.GetUpperBound(0) == 2) |
58 | resource = resourcesplit[1]; | 58 | resource = resourcesplit[1]; |
59 | 59 | ||
60 | username = jidsplit[0]; | 60 | username = jidsplit[0]; |
61 | |||
62 | } | 61 | } |
63 | } | 62 | } |
64 | } | 63 | } |
65 | } | 64 | } |
66 | } | 65 | } \ No newline at end of file |