diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:31:39 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:31:39 +0000 |
| commit | 60e049ea39f9b347ac1395c2373d17a983ab7ff3 (patch) | |
| tree | 759e0a9067cb382d68cd6b01339f5c2256644c63 /OpenSim/Region/ClientStack | |
| parent | Revert "Add line accidentally left out of recent non-root prim sit fix" (diff) | |
| download | opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.zip opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.gz opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.bz2 opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.xz | |
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
Reverting to place on separate branch
This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 29751ff..20bc59c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -5218,13 +5218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5218 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + | 5218 | update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + |
| 5219 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); | 5219 | data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); |
| 5220 | update.ObjectData = objectData; | 5220 | update.ObjectData = objectData; |
| 5221 | 5221 | update.ParentID = data.ParentID; | |
| 5222 | SceneObjectPart parentPart = data.ParentPart; | ||
| 5223 | if (parentPart != null) | ||
| 5224 | update.ParentID = parentPart.ParentGroup.LocalId; | ||
| 5225 | else | ||
| 5226 | update.ParentID = 0; | ||
| 5227 | |||
| 5228 | update.PathCurve = 16; | 5222 | update.PathCurve = 16; |
| 5229 | update.PathScaleX = 100; | 5223 | update.PathScaleX = 100; |
| 5230 | update.PathScaleY = 100; | 5224 | update.PathScaleY = 100; |