diff options
Done a little bit of renaming in primitive.cs and on a few events in IClientAPI.
Disabled CAPS asset uploading as it seems it now crashes the server.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EntityBase.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 7914bab..6360ae1 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
38 | } | 38 | } |
39 | } | 39 | } |
40 | 40 | ||
41 | public LLVector3 velocity; | 41 | public LLVector3 m_velocity; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// | 44 | /// |
@@ -47,25 +47,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
47 | { | 47 | { |
48 | get | 48 | get |
49 | { | 49 | { |
50 | return velocity; | 50 | return m_velocity; |
51 | } | 51 | } |
52 | set | 52 | set |
53 | { | 53 | { |
54 | velocity = value; | 54 | m_velocity = value; |
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | public Quaternion _rotation = new Quaternion(0,0,1,0); | 58 | protected Quaternion m_rotation = new Quaternion(0,0,1,0); |
59 | 59 | ||
60 | public virtual Quaternion rotation | 60 | public virtual Quaternion rotation |
61 | { | 61 | { |
62 | get | 62 | get |
63 | { | 63 | { |
64 | return _rotation; | 64 | return m_rotation; |
65 | } | 65 | } |
66 | set | 66 | set |
67 | { | 67 | { |
68 | _rotation = value; | 68 | m_rotation = value; |
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
85 | uuid = new LLUUID(); | 85 | uuid = new LLUUID(); |
86 | 86 | ||
87 | m_pos = new LLVector3(); | 87 | m_pos = new LLVector3(); |
88 | velocity = new LLVector3(); | 88 | m_velocity = new LLVector3(); |
89 | rotation = new Quaternion(); | 89 | rotation = new Quaternion(); |
90 | m_name = "(basic entity)"; | 90 | m_name = "(basic entity)"; |
91 | children = new List<EntityBase>(); | 91 | children = new List<EntityBase>(); |