ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 08:25:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,007 Commits 5 Branches 82 Tags
a893fd90cdc58f4e63c0cec87f289d520d5e71f8
Commit Graph

1032 Commits

Author SHA1 Message Date
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Snoopy Pfeffer
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
Michael Cerquoni
6b1d09813e remove some whitespace that snuck in with last patch 2014-04-03 13:25:32 -04:00
Dev Random
50eec6df52 Add Varregion support to Terragen Handler 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2014-04-03 13:14:13 -04:00
Dev Random
4aa483777b Move new Estate commands to OpenSim.cs 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2014-04-03 12:45:43 -04:00
Mic Bowman
ac16a667e1 fix orphaned code in sun module per mantis 7068 2014-04-01 19:48:03 -07:00
Justin Clark-Casey (justincc)
e5a5b69b08 remove EstateManagmentCommands.m_commander that has been unused for some time 2014-04-02 01:23:40 +01:00
Dev Random
43eab5e163 Console command to rename Estate 2014-04-02 01:17:41 +01:00
Dev Random
635f3f77ab Console command to change Estate owner 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2014-03-29 00:59:15 -04:00
Oren Hurvitz
6557eba235 Removed default timeout when starting scripts after Load OAR 2014-03-28 13:04:19 +03:00
Justin Clark-Casey (justincc)
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
Oren Hurvitz
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
Justin Clark-Casey (justincc)
091f3a8000 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-03-25 00:20:38 +00:00
Justin Clark-Casey (justincc)
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
6edc446780 Fixed: OnRegionInfoChange was never triggered 
Resolves http://opensimulator.org/mantis/view.php?id=6934
 2014-03-24 18:01:22 +01:00
Oren Hurvitz
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
H-H-H
da25903300 Adding a way to disable/enable the in built Dwell Module 2014-03-20 22:35:50 +00:00
Michael Cerquoni
b5f94c72b9 Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles 2014-03-19 11:16:52 -04:00
Jak Daniels
61353dde80 Allow Region specific static maptiles to be loaded from file. 2014-03-18 22:18:50 -07:00
Justin Clark-Casey (justincc)
86630a1b70 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-03-11 23:39:07 +00:00
Justin Clark-Casey (justincc)
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
Robert Adams
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
Robert Adams
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
ddd38a3dea Add scene name to bad parcel add logging 2014-03-06 19:12:16 +00:00
Justin Clark-Casey (justincc)
58c0ed78d4 refactor: Simplify land object by using c# get/set auto-properties where applicable. 2014-03-06 02:12:58 +00:00
Justin Clark-Casey (justincc)
470d053443 minor: slightly simplify code in LandObject.ContainsPoint() 2014-03-06 00:51:39 +00:00
Justin Clark-Casey (justincc)
ed14e97bb4 Remove array initialize calls in LMM - these are unnecessary as the VM already does this. 2014-03-06 00:46:16 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Robert Adams
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
Robert Adams
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
Robert Adams
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
Robert Adams
41b6602a77 Add "--no-objects" parameter to 'load oar'. 2014-02-02 22:16:01 -08:00
Robert Adams
8c6a0cb44a Really add the old parameter names to load oar to keep downward compatibiliy 2014-02-02 17:18:08 -08:00
Robert Adams
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
Robert Adams
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
Justin Clark-Casey (justincc)
b2878eb773 Merge branch 'justincc-master' 2014-01-31 00:51:22 +00:00
Oren Hurvitz
b8e22f02e7 Make sure Web streams are disposed after use 2014-01-31 00:44:22 +00:00
Mic Bowman
fbf33ef1de Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-01-28 22:42:35 -08:00
Mic Bowman
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