Oren Hurvitz
ca0336d834
Renamed MaterialsDemoModule to MaterialsModule
2014-01-20 00:38:41 -08:00
Oren Hurvitz
e8273fa8ad
- Materials: support the viewer removing the material (in which case matsMap["Material"] is missing) - Reduced logging
2014-01-20 00:37:26 -08:00
Robert Adams
90fa3202c6
varregion: remove debugging splat file saving that fills up the
...
maptile dir and causes errors.
2014-01-19 13:37:51 -08:00
Robert Adams
5e6a47f13f
varregion: remove --noterrain and --noparcel parameters in 'load oar'.
...
Add --forceterrain and --forceparcel to 'load oar'. In order to not change
the operation of --merge (which does an object merge and suppresses terrain
and parcel information loading), added the --force* parameters to be used
when loading multiple oars to build up a varregion.
Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to
the loaded oar objects before displacing. The rotation is in degrees (pos or neg)
and the center defaults to "<128, 128, 0>".
2014-01-19 12:45:16 -08:00
Robert Adams
6fbfb47b92
varregion: add --noterrain and --noparcel to 'load oar'.
...
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
2014-01-19 11:03:08 -08:00
Robert Adams
dd6db72939
varregion: add --displacement parameter to 'load oar'.
...
Adds displacment to all objects and terrain loaded from the oar.
As an example, if you have a 512x512 region and an old 256x256 oar, doing
load oar --displacement "<128,128,0>" oarFile.oar
will load the object (and terrain) into the middle of the 512x512 region.
If displacement is not specified, 'load oar' works like it always has.
If you have a 5
2014-01-19 10:09:43 -08:00
Robert Adams
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
Robert Adams
4fb3d314b8
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:37:14 -08:00
Robert Adams
54a4b9eab4
varregion: Update Warp3D to properly handle varregions.
...
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
2014-01-19 07:33:56 -08:00
Robert Adams
813f0da00b
Add J2K decoder routine that converts directly to an image.
2014-01-19 07:32:41 -08:00
Robert Adams
08fa0a6a8a
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:26:55 -08:00
Robert Adams
60de0bc3c2
varregion: split up generated maptile images for storage in map. This
...
makes maps for varregions show up properly.
2014-01-19 05:09:03 -08:00
Justin Clark-Casey (justincc)
d466446df3
Merge branch 'justincc-master'
2014-01-18 01:39:45 +00:00
Justin Clark-Casey (justincc)
e9454d4672
Following on from 50ea2e0
, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check
2014-01-18 01:36:40 +00:00
Oren Hurvitz
50ea2e0d67
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-18 01:26:30 +00:00
Justin Clark-Casey (justincc)
0cbe5f8424
Remove redundant methods in FlotsamAssetCache
2014-01-18 00:55:49 +00:00
Justin Clark-Casey (justincc)
b9453a8f6f
implement CoreAssetCache.Check()
2014-01-18 00:52:36 +00:00
Justin Clark-Casey (justincc)
427ffd3387
implement GlynnTuckerAssetCache.Check()
2014-01-18 00:48:20 +00:00
Justin Clark-Casey (justincc)
fc7ccfdafa
Properly implement CenomeAssetCache.Check()
2014-01-18 00:30:23 +00:00
Justin Clark-Casey (justincc)
ee8ba1ab9a
Simplify FlotsamAssetCache.CheckFromMemoryCache()
2014-01-18 00:21:53 +00:00
Justin Clark-Casey (justincc)
d381da81d6
minor: Add method doc to IImproveAssetCache
2014-01-18 00:15:38 +00:00
Justin Clark-Casey (justincc)
97fbb8ed45
Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use using() construct to ensure filestream is always closed
2014-01-18 00:12:12 +00:00
Justin Clark-Casey (justincc)
12bfce7b9f
elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
...
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
Justin Clark-Casey (justincc)
b52b50ee56
minor: reinsert some method doc back into IEntityTransferModule
2014-01-17 23:36:23 +00:00
Justin Clark-Casey (justincc)
9fefbcf7fc
minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary.
2014-01-17 23:32:37 +00:00
Justin Clark-Casey (justincc)
14c72d4a5b
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
...
This reverts commit 39e5785c0f
.
Did not mean to apply this yet.
2014-01-17 01:58:10 +00:00
Justin Clark-Casey (justincc)
18e0d2f343
minor: Add Ai Austin to additional OpenSim contributors by request as he has added config corrections and does extensive liaison with other projects
2014-01-17 01:55:40 +00:00
Oren Hurvitz
39e5785c0f
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-17 01:47:37 +00:00
Justin Clark-Casey (justincc)
4fa843ff19
Reorder checks in SP.CompleteMovement() to fix test failures
2014-01-16 23:44:17 +00:00
Justin Clark-Casey (justincc)
f467121c51
Merge branch 'justincc-master'
2014-01-16 23:33:30 +00:00
Justin Clark-Casey (justincc)
3bc669ffc7
Actually put IsChildAgent = true inside the lock, otherwise there is still a small window for race conditions on duplicate CompleteMovement calls
2014-01-16 23:31:50 +00:00
Justin Clark-Casey (justincc)
3ffd90496a
Prevent duplicate invocations or race dontision in SP.CompleteMovement()
...
This can happen under poor network conditions if a viewer repeats the message send
If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
2014-01-16 20:23:31 +00:00
Justin Clark-Casey (justincc)
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
Oren Hurvitz
2d9d6fe922
Can delete the Offline Messages sent to/from a user.
...
This is useful if the user is deleted.
2014-01-16 00:24:51 +00:00
Oren Hurvitz
46c2791fe2
In the offline message table, store the sender.
...
This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
2014-01-16 00:16:33 +00:00
Oren Hurvitz
21bc799a17
Fixed offline IM
2014-01-16 00:10:10 +00:00
Justin Clark-Casey (justincc)
e99a7d879e
Remove old IInterRegionComms and references. This hasn't been used since 2009 and was superseded by ISimulationService
2014-01-16 00:05:04 +00:00
Justin Clark-Casey (justincc)
4675a2fb29
Merge branch 'justincc-master'
2014-01-14 01:19:54 +00:00
Justin Clark-Casey (justincc)
797684115c
minor: Add David Rowe to ctrlaltdavid handle by request
2014-01-14 01:16:04 +00:00
Robert Adams
cc5cffc212
varregion: properly pack the region size parameters so he viewer will parse them.
...
This gets rid of the viewer crash when teleporting into varregions and allows
multiple, adjacent varregions (of the same size) with border crossings.
2014-01-11 22:00:52 -08:00
Robert Adams
1eea6fd452
varregion: Debug messages for region crossing debugging.
2014-01-11 22:00:24 -08:00
Robert Adams
3760d10cd0
varregion: remove unnecessary border checking code in ScenePresence.
2014-01-11 21:59:22 -08:00
Robert Adams
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
Robert Adams
239b85d7ce
Fix crash in BulletSim which sometimes happens making a linkset physical
...
(like sitting on and activating a vehicle) and crossing borders.
This keeps better bookkeeping on compound shapes so BulletSim can
identify them when being freed.
2014-01-10 22:52:31 -08:00
Justin Clark-Casey (justincc)
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
Oren Hurvitz
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
Justin Clark-Casey (justincc)
66e2e1c9c3
Merge branch 'justincc-master'
2014-01-10 20:52:50 +00:00
Justin Clark-Casey (justincc)
70dd4cf152
In library inventory, correct asset id for llSay example script
...
From http://opensimulator.org/mantis/view.php?id=6917
Thanks to FreakyTech for this spot.
2014-01-10 20:51:28 +00:00
Justin Clark-Casey (justincc)
09e800f4b1
Merge branch 'justincc-master'
2014-01-10 20:46:00 +00:00
Justin Clark-Casey (justincc)
8c6b9ef865
minor: Add ctrlaltdavid to contributors list
2014-01-10 20:45:05 +00:00