018832522c
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
2014-04-23 14:38:33 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
93a9ed2a6d
Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures.
2014-04-22 12:18:54 +03:00
4cac87d9f4
Fixed: when a user logged-in, sometimes he didn't get notified of the Online status of friends, so they continued to appear Offline.
...
This happened because these notifications (the UDP packets) can only be sent to Root Agents. But the notifications were done in OnClientLogin(), at which point the client is still a Child Agent. Since a FireAndForget is used, it became a race condition as to whether the packets would be sent before or after the client became a Root Agent.
To fix this, we now only send the notifications once the client becomes a Root Agent for the first time.
2014-04-21 16:56:49 +01:00
3f76f72137
Better error-handling when storing assets: recognize that 'null' is an error value
2014-04-20 06:23:38 +01:00
090f9bcece
Fixed: once a user has rezzed an object, they could then duplicate it as much as they wanted even if the parcel's permissions had since been changed to disallow rezzing
2014-04-20 06:23:36 +01:00
3185db7f94
Fixed: if a user belonged to the parcel's group then he was allowed to rez object in the parcel even if the flag "Create Objects by Group" was disabled
2014-04-20 06:23:36 +01:00
a780e01a54
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
...
Also some cleanup of the use of Group ID's (with no change to functionality).
2014-04-20 06:23:35 +01:00
63fd027494
Catch empty url error
2014-04-19 22:25:21 -04:00
b3ebec184f
In teleports, when sending the Source region, set its ServerURI to the Gatekeeper URI (which is used with Regions); not the Home URI (which is used with Users)
2014-04-13 12:58:37 +03:00
32ad66c274
Allows to sell objects on a parcel of land together with that parcel of land. The objects that are sold together with the parcel of land need to fulfill the following preconditions: owned by the current parcel owner, not set to a group, transferrable. This feature does not work for group owned parcels or land bought by a group.
2014-04-10 11:47:46 +02:00
06e0528d0b
In teleports, pass the source region to the destination (similar to an HTTP referrer)
2014-04-09 09:22:20 +01:00
af406748a2
Improved error messages when a teleport fails. The viewer's dialog already says "Teleport failed", so adding "Teleport refused" is redundant.
2014-04-08 08:11:30 +01:00
e00f1a0410
Allow invalidating the users cache
2014-04-08 08:11:29 +01:00
85d51e57a9
When sending QueryAccess to a region, also send the user's Home URI
2014-04-07 07:32:36 +01:00
55cc8044cb
Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user
2014-04-07 07:26:44 +01:00
f3508649f5
Fixed: during a teleport we always sent the error "The teleport destination could not be found" to the client. This happened on both success and failure.
...
On successful teleports this error wasn't actually shown to the user. But on failed teleports this error could hide the true cause of the failure. For example, attempting to use a Landmark that's more than 4095 regions away would result in two warnings appearing in the viewer: "Region too far" and "Destination could not be found". The second message hid the first one, so it wasn't obvious to the user what is actually the problem.
2014-04-06 15:42:33 +01:00
abe0f4a088
When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid.
...
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
2014-04-06 15:40:45 +01:00
d4acaf25af
Pass the correct position to QueryAccess() instead of UUID.Zero (it was wrong in one place)
2014-04-06 15:40:45 +01:00
6b1d09813e
remove some whitespace that snuck in with last patch
2014-04-03 13:25:32 -04:00
50eec6df52
Add Varregion support to Terragen Handler
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 13:14:13 -04:00
4aa483777b
Move new Estate commands to OpenSim.cs
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-04-03 12:45:43 -04:00
6d2893be67
When teleporting using Hypergrid, show more informative error messages in case of error
2014-04-03 14:13:03 +01:00
65c4cb48ac
BulletSim: make avatar physical shape to be a rectangle rather than
...
a capsule. Set the default to be the rectangle shape and adjust the
parameters in OpenSimDefaults.ini for the new shape.
The rectangle shape will perform better and avatar height can be
computed more accurately.
2014-04-02 21:53:58 -07:00
91b7679db9
minor: Fix warning in AvatarFactoryModule
2014-04-03 00:35:42 +01:00
17929abd28
Wrap contents of ETM.CrossAgentToNewRegionAsync() in try/catch to avoid a failure terminating simulators running on Windows
...
In relation to http://opensimulator.org/mantis/view.php?id=7050
2014-04-03 00:34:20 +01:00
d1c3f8eef5
Added assets service method AssetsExist(), which returns whether the given list of assets exist.
...
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
ac16a667e1
fix orphaned code in sun module per mantis 7068
2014-04-01 19:48:03 -07:00
e5a5b69b08
remove EstateManagmentCommands.m_commander that has been unused for some time
2014-04-02 01:23:40 +01:00
43eab5e163
Console command to rename Estate
2014-04-02 01:17:41 +01:00
635f3f77ab
Console command to change Estate owner
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-29 00:59:15 -04:00
6557eba235
Removed default timeout when starting scripts after Load OAR
2014-03-28 13:04:19 +03:00
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
b0bae62c30
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
2014-03-26 20:58:58 +00:00
7a47c15edb
- Increased the threadpool timeout to 10 minutes
...
- Changed a few places that launch long-lasting threads to skip the timeout altogether
2014-03-26 20:34:55 +01:00
14836e60ff
Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels.
2014-03-25 11:10:48 -04:00
542bef20e8
Move JsonRpc request code out for general availability
2014-03-25 11:08:27 -04:00
368b29a680
In Core Profiles: as a fallback, try to get profiles from foreign grids using the OpenProfile protocol
...
Resolves http://opensimulator.org/mantis/view.php?id=6954
2014-03-25 09:37:18 +01:00
e131e73652
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:55 +01:00
091f3a8000
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-25 00:20:38 +00:00
e12c044eab
Don't fail to enable permissions modules correctly if there is any leading or trailing whitespace between comma separate module combinations.
2014-03-25 00:19:24 +00:00
1a32b35279
In Load OAR, correctly restore group-owned objects
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:23 +01:00
305f5110c6
In Load OAR: Zero isn't a valid Group ID
...
Resolves http://opensimulator.org/mantis/view.php?id=6943
2014-03-24 18:18:08 +01:00
35078e03e5
During Load OAR, fix the User and Group ID's in objects that are embedded in assets (previously only rezzed objects were fixed)
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:59 +01:00
5fd9411143
Refactored Load IAR: created a generic mechanism to modify the SOG's as they are being loaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:35 +01:00
c8583e566d
When searching for users, don't add users from the local cache if they have an invalid UUID
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:37 +01:00
a2dd8f31de
Trim search queries (for users, groups, etc.). I have found that sometimes the viewer adds a space at the end, which causes searches to fail.
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:28 +01:00
6edc446780
Fixed: OnRegionInfoChange was never triggered
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:22 +01:00
bf68dbabd7
Save to database these parcel updates: Force Owner, Abandon Request, Reclaim. (Previously these updates only changed the parcel in memory)
...
Resolves http://opensimulator.org/mantis/view.php?id=6934
2014-03-24 18:01:08 +01:00
db83208794
Fix negative stat for Active Scripts
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-22 23:02:10 -04:00
ff5c38534d
Reverting "Set default name for mute list" that was pushed by mistake.
...
This reverts commit 58def34dbe
2014-03-22 16:38:48 -04:00
58d7e3b8ed
Reverting "Pass method to offline.php" commit that was pushed by mistake.
...
This reverts commit fe16a72a9a
2014-03-22 16:31:36 -04:00
fe16a72a9a
Pass method to offline.php using ?blah instead of /blah/. Avoids issue with Apache web servers running PHP via CGI.
2014-03-22 15:13:03 -04:00
58def34dbe
Set default name for mute list module as shown in OpenSim.ini.example
2014-03-22 15:13:03 -04:00
da25903300
Adding a way to disable/enable the in built Dwell Module
2014-03-20 22:35:50 +00:00
b5f94c72b9
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
2014-03-19 11:16:52 -04:00
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
7112ee0015
Enable MapImageServiceModule with no refresh
2014-03-11 23:52:11 +00:00
86630a1b70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-03-11 23:39:07 +00:00
d975b42f6a
Instead of auto-creating a parcel on request if one doesn't cover a given location, fill in gaps or extend existing parcel right after initial data load.
...
This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all.
Making this change as another step to address current problems with spurious parcels occasionally being created.
Also adds regression tests for different load behaviours depending on existing stored parcel data.
Relates to http://opensimulator.org/mantis/view.php?id=7035
2014-03-11 23:38:22 +00:00
8edf4225f3
varregion: remove serialization of region terrain to floats when sending patches.
...
This should eliminate much memory thrashing and CPU usage while sending initial
terrain.
The old way of passing terrain was to convert it to an array of floats. This is
really bad for large terrain (think 4096x4096 floats). This change passes a dummy
float array since the real region info is used anyway and the floats are ignored.
(The ignoring the terrain floats is a kludge so as to not change IClientAPI.)
2014-03-11 07:12:47 -07:00
742f505440
Change terrain update sending to be triggered by frame tick rather
...
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
2014-03-10 22:05:18 -07:00
120f872d2b
After an object with KeyframeMotion is copied into inventory, resume the motion (previously it remained stopped)
2014-03-11 00:43:22 +00:00
8225e3f40c
Remove try/catch in LandManagmentModule.GetLandObject() - this is very old code and the caught exceptions can no longer occur.
2014-03-07 01:41:31 +00:00
3c05d67094
Lock m_landlist whilst loading parcels from storage to prevent a race against any parcel auto-creation in GetLandObject()
2014-03-07 01:36:06 +00:00
6b7625a56b
Only auto-create a land parcel when there is none in a specified tile if there is more than 1 existing land parcel.
...
This is because there are still issues with bad parcels being generated in http://opensimulator.org/mantis/view.php?id=7035
Theorizing now that it's possible that something is calling GetParcel() before any parcel data has been loaded from persistence.
2014-03-07 01:23:19 +00:00
ddd38a3dea
Add scene name to bad parcel add logging
2014-03-06 19:12:16 +00:00
58c0ed78d4
refactor: Simplify land object by using c# get/set auto-properties where applicable.
2014-03-06 02:12:58 +00:00
470d053443
minor: slightly simplify code in LandObject.ContainsPoint()
2014-03-06 00:51:39 +00:00
ed14e97bb4
Remove array initialize calls in LMM - these are unnecessary as the VM already does this.
2014-03-06 00:46:16 +00:00
aa2fb1ec25
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
2014-03-06 00:40:24 +00:00
14569992e1
Prevent adding a land object if it overlaps any existing objects that have not had their bitmaps adjusted.
...
This is to prevent an immediate problem in http://opensimulator.org/mantis/view.php?id=7035 where a development code bug occasionally overlays all the existing parcels with a blank parcel owned by the estate manager and to gather more data.
My guess is that this parcel is being created by the new code in LandManagementModule.GetLandObject(), probably some race between threads since this only happens occasionally.
Adds regression tests for this case and for parcel subdivide.
2014-03-06 00:11:13 +00:00
5038a59ef3
Maybe slightly reduce warp3d memory leakage by disposing of decoded bitmap in Warp3DImageModule.GetTexture()
...
However, this still appears to be leaking massively, at least for me. Possible cause is warp3D using GDI objects internally and not disposing of them.
2014-02-28 00:16:06 +00:00
26fe59c35e
Improve regression test TestSetAppearance()
2014-02-24 19:43:06 +00:00
bc9952f901
Re-enable regression TestSaveBakedTextures()
2014-02-24 19:30:33 +00:00
fd1b2a1c57
Stop mesh avatars that specify the alpha texture in their bake slots from causing the simulator to continually request that they rebake
...
This is because the alpha texture is not in the cache, we must continue to have the fallback of looking for these and other persisted bakes in the asset service.
Relates to http://opensimulator.org/mantis/view.php?id=6927
2014-02-24 19:20:50 +00:00
11b4f534c2
If texture decode fails in Warp3D map maker, log uuid of asset that failed to decode along with exception
2014-02-20 23:36:50 +00:00
28419251bf
minor: Add some method doc to AFM,SetAppearanceAssets()
2014-02-20 19:30:47 +00:00
4d1426e77d
For now, do not replacing missing wearables with default wearables if itme details cannot be found.
...
This is causing many issues on OSGrid, possibly due to teleporting timing differences with simulators hosted in different places or HG teleports
Added a bit more logging for debug purposes.
See http://opensimulator.org/mantis/view.php?id=6939
2014-02-20 18:40:21 +00:00
a2866b85f3
add newRegion parameter to CrossAgentToNewRegion event and trigger the event after crossing thread is invoked
2014-02-20 00:18:28 -08:00
fc9930e420
Repair check for if in region position (I mean || is kinda like &&).
2014-02-15 18:49:40 -08:00
79200ed270
Fix displacement and location operations on legacy trees and grass in
...
the 'load oar' and 'scene' commands. Before they were ignored but the
code now relies on the SOG.IsAttachment function for attachmentness.
2014-02-15 17:10:20 -08:00
7fc289c039
Properly restore position on crossing failure for mega-regions.
...
Fix odd "cannot cross into banned parcel" viewer error message when crossing
into non-existant region. Proper permission failure messages are now returned.
2014-02-15 17:02:53 -08:00
877bdcdce1
Rewrite of mega-region code to use new form of border checking.
...
This commit eliminates all of the 'border' class and list code and replaces
it with testing if in the current region.
Impacts: can make a mega-region out of varregions of the same size; and
mega-region combinations must be rectangular (not square but rectangular)
2014-02-15 16:01:43 -08:00
bdbbeaa494
Non-functional changes of numbers into symbolic references and a few
...
comments on what variables really mean.
2014-02-15 16:01:01 -08:00
ffd0da23fb
Merge branch 'justincc-master'
2014-02-14 00:16:17 +00:00
f49d513089
Change warns associated with UserAgentServiceConnector to debugs, as this is not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted).
...
This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
2014-02-14 00:08:13 +00:00
fc35b45e21
If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not.
...
This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
2014-02-14 00:01:12 +00:00
29c8461631
Remove the added whitespace, test concluded
2014-02-04 05:54:28 +00:00
8f372b8ac8
Bot test
2014-02-04 05:52:22 +00:00
342be228c6
Remove compile error from returning value in void function
2014-02-03 21:53:14 -08:00
1b41ec0a85
Fix raw32 terrain heightmap reader so it estimates terrain size from
...
the size of the input stream. This is required since the raw heightmap
format (.r32) does not contain any size information.
The estimation relies on terrain being square.
2014-02-03 21:23:32 -08:00
31cba5aa66
Add one check for a blank URL because the module wasn't quite sure not to work when unconfigured :|
2014-02-04 04:20:37 +00:00
1197658233
Adding the Avination XBakesModule, the client for the persistent bakes system
2014-02-04 02:09:39 +00:00
41b6602a77
Add "--no-objects" parameter to 'load oar'.
2014-02-02 22:16:01 -08:00
8c6a0cb44a
Really add the old parameter names to load oar to keep downward compatibiliy
2014-02-02 17:18:08 -08:00
2a4dd34616
Change new 'load oar' parameters to be hyphenated to be consistant with
...
existing parameters. ('--forceterrain' becomes '--force-terrain').
The old forms have been kept for downward compatiblity.
2014-02-02 12:21:18 -08:00
9c97fb8e12
Implement terrain merging in TerrainChannel.
...
Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.
2014-02-02 11:17:49 -08:00
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
fbf33ef1de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 22:42:35 -08:00
3f5c6c897f
One more run at fixing the sun module. Parameter setting fixed to
...
work through the OSSL interface. And setting the parameters now
adjusts all the dependent variables correctly so the sun moves
at the modified rate.
2014-01-28 22:40:39 -08:00
1900254e77
Restore brush tests with correct values and adjustments for new terrain height
...
rounding characteristics.
2014-01-28 21:43:18 -08:00
678c107915
Temporarily disable brush test. It will come back when tuning is complete.
2014-01-28 16:58:27 -08:00
dde0e547a7
Change area of brush test to account for rounding errors in terrain implementation
2014-01-28 16:48:34 -08:00
226b5e4d75
Increase the strength of brushes in brush test in an attempt to overcome rounding
...
introduced with new terrain height class.
2014-01-28 16:36:56 -08:00
cfe1bced7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-01-28 16:34:49 -08:00
2877c7d94d
Actually make the parameter updates change the behavior of
...
sun movement.
2014-01-28 16:34:22 -08:00
0c3493f619
clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size
2014-01-28 16:25:01 -08:00
d25265ae82
Fix terrain tests by properly initializing low detail terrain to zero height.
...
Also remove PI heightmap test as new heightmaps only have two significant digits.
2014-01-28 15:58:45 -08:00
bfb0011cd3
Some major surgery on the sun module. Updates to the client were gated
...
by a "mode" check. That mode check has been removed (it didn't result
in any change of behavior anyway). Also added a command line variable
update to set the sun position time offset (offset from the system
clock). Default is no offset to preserve existing behavior.
2014-01-28 15:43:47 -08:00
49af6b53e7
varregion: enable teleporting to a varregion by clicking on the map and
...
pressing the 'teleport' button.
This commit adds returning region map info for all the subregions of a
varregion. This also handles the selection of the extra region and then
the displacement of the postion so the teleport is to the correct location.
2014-01-26 19:32:28 -08:00
13a9d5409c
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
2014-01-26 07:56:47 -08:00
6831e58616
varregion: modify MapImageModule structure so it will better merge
...
with changes made in master.
2014-01-26 07:38:28 -08:00
966ab21839
Merge branch 'justincc-master'
2014-01-24 00:17:39 +00:00
a2d5d810e0
Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
2014-01-24 00:14:58 +00:00
a859464e91
Add "generate map" console command to allow manual regeneration and storage of maptiles
...
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
90fa3202c6
varregion: remove debugging splat file saving that fills up the
...
maptile dir and causes errors.
2014-01-19 13:37:51 -08:00
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
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
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
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
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
813f0da00b
Add J2K decoder routine that converts directly to an image.
2014-01-19 07:32:41 -08:00
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
0cbe5f8424
Remove redundant methods in FlotsamAssetCache
2014-01-18 00:55:49 +00:00
b9453a8f6f
implement CoreAssetCache.Check()
2014-01-18 00:52:36 +00:00
427ffd3387
implement GlynnTuckerAssetCache.Check()
2014-01-18 00:48:20 +00:00
fc7ccfdafa
Properly implement CenomeAssetCache.Check()
2014-01-18 00:30:23 +00:00
ee8ba1ab9a
Simplify FlotsamAssetCache.CheckFromMemoryCache()
2014-01-18 00:21:53 +00:00
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
12bfce7b9f
elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
...
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
9fefbcf7fc
minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary.
2014-01-17 23:32:37 +00:00
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
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
1eea6fd452
varregion: Debug messages for region crossing debugging.
2014-01-11 22:00:24 -08:00
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
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
88f01a4130
When creating a coalesced object, set its permissions to the lowest-common-denominator of all the sub-objects
2014-01-10 20:01:08 +00:00
a94e1e0e08
When creating a coalesced object, set its Creator ID if all the objects have the same creator
2014-01-10 19:54:17 +00:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
38148bd4b6
Some missing definitions needed for successful compilation.
2014-01-04 19:01:05 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
9984ecf862
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
2014-01-03 07:41:06 -08:00
Oren Hurvitz