diff options
| author | David Seikel | 2011-03-20 17:02:40 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-20 17:02:40 +1000 |
| commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
| tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/llinventory | |
| parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
| parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
| download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz | |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to 'linden/indra/llinventory')
| -rw-r--r-- | linden/indra/llinventory/llparcel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h index 0af9ab7..1a1205b 100644 --- a/linden/indra/llinventory/llparcel.h +++ b/linden/indra/llinventory/llparcel.h | |||
| @@ -67,6 +67,7 @@ const F32 PARCEL_PASS_HOURS_DEFAULT = 1.f; | |||
| 67 | 67 | ||
| 68 | // Number of "chunks" in which parcel overlay data is sent | 68 | // Number of "chunks" in which parcel overlay data is sent |
| 69 | // Chunk 0 = southern rows, entire width | 69 | // Chunk 0 = southern rows, entire width |
| 70 | // NOTE: NOT USABLE FOR VAR SIZED REGIONS! | ||
| 70 | const S32 PARCEL_OVERLAY_CHUNKS = 4; | 71 | const S32 PARCEL_OVERLAY_CHUNKS = 4; |
| 71 | 72 | ||
| 72 | // Bottom three bits are a color index for the land overlay | 73 | // Bottom three bits are a color index for the land overlay |