ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-28 04:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,550 Commits 5 Branches 93 Tags
52370ac94de4f449645eb0471fab4cc515fccbe2
Commit Graph

3298 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
ee8ba1ab9a Simplify FlotsamAssetCache.CheckFromMemoryCache() 2014-01-18 00:21:53 +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)
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)
1a8b56fa87 Merge branch 'justincc-master' 2014-01-16 00:33:04 +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
Robert Adams
1eea6fd452 varregion: Debug messages for region crossing debugging. 2014-01-11 22:00:24 -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
Justin Clark-Casey (justincc)
5e72de1908 Merge branch 'justincc-master' 2014-01-10 20:19:38 +00:00
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Oren Hurvitz
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
Robert Adams
38148bd4b6 Some missing definitions needed for successful compilation. 2014-01-04 19:01:05 -08:00
Robert Adams
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
Robert Adams
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
Robert Adams
01c0bbf181 varregion: extract banned region logic into a class for cleanlyness. 
Add 'not found' caching in EntityTransferModule.GetRegionContainingWorldLocation
so hitting borders and bad teleports do not continuiously hammer on the GridService.
 2013-12-27 08:23:37 -08:00
Robert Adams
2d2bea4aa7 varregion: many more updates removing the constant RegionSize and replacing 
with a passed region size. This time in the map code and grid services code.
 2013-12-26 22:45:59 -08:00
Robert Adams
e5f7c8b6e8 varregion: add lots of DEBUG level log messages. Especially for teleport. 2013-12-24 12:31:26 -08:00
Robert Adams
5c9fa15f30 varregion: fix bug where destination region is not found and object is 
not restored to its original location.
 2013-12-24 11:51:50 -08:00
Robert Adams
6937eec258 Merge branch 'master' into varregion 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-17 06:18:13 -08:00
BlueWall
141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05:00
Robert Adams
13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08:00
Justin Clark-Casey (justincc)
bf826699a5 Merge branch 'justincc-master' 2013-12-14 01:13:17 +00:00
Justin Clark-Casey (justincc)
d656ec2a07 Make WindParamSet success a console message rather than a log message. 
This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
 2013-12-14 01:07:37 +00:00
Justin Clark-Casey (justincc)
5ddd818238 minor: Make wind console commands print out to console rather than log 2013-12-14 00:50:06 +00:00
Melanie
5b73b9c4a8 Committing the Avination Scene Presence and related texture code 
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
 2013-12-11 01:39:56 +00:00
Melanie
97934e00e6 This is the Avination Entity Transfer Module. Surprisingly, it still compiles 
but I don't know if it runs. Will probably crash and burn as the supporting
code isn't there yet.
 2013-12-11 00:12:36 +00:00
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Robert Adams
6cd0d7a62b varregion: Add MaxRegionSize constant and enforce in RegionInfo. 
Intermediate checkin of changing border cross computation from checking
boundry limits to requests to GridService. Not totally functional.
 2013-11-30 15:28:39 -08:00
Robert Adams
7aa00632b9 varregion: many replacements of in-place arithmetic with calls to 
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
 2013-11-28 08:20:16 -08:00
Robert Adams
3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08:00
Justin Clark-Casey (justincc)
9f4a548a49 Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. 
Use 0.0.0.0 instead of localhost
 2013-11-23 01:04:31 +00:00
Justin Clark-Casey (justincc)
ecfb78dd16 minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null 
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
 2013-11-15 23:16:12 +00:00
Robert Adams
604b39cea9 Merge branch 'master' into varregion 2013-11-15 14:56:13 -08:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
Justin Clark-Casey (justincc)
b4932bda2a If a local land ID is given to the "land show" command, then output to console the full details of that parcel. 
Using "land show" without a land ID still outputs a summary of parcels in the region
 2013-11-15 00:16:33 +00:00
Robert Adams
e2a1fa806d varregion: extend TerrainModule to use the region size from RegionInfo 
rather than using Constants.RegionSize. This allows loading and saving
of terrain heightmaps that match the size of non-legacy sized regions.
 2013-11-10 21:12:17 -08:00
Robert Adams
c12e68e34d varregion: fix GetLandObject error return and initialization of square 
land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
 2013-11-10 19:52:31 -08:00
Robert Adams
beeec1c467 varregion: elimination of Constants.RegionSize from all over OpenSimulator. 
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
 2013-11-08 20:53:37 -08:00
Robert Adams
a7a837550e varregion: Massive work to LandManagementModule and LandObject to 
handle variable sized regions. Many changes for both the region and parcels.
Most of the constant "4" (for the 4x4 parcel units) have been replaced
with symbols and math.
 2013-11-08 20:51:09 -08:00
Robert Adams
c931b16c1f Merge branch 'master' into varregion 2013-11-04 22:12:57 -08:00
Justin Clark-Casey (justincc)
fdd1c63c3c Make "fcache status" command also display information on disk/mem cache hit rate that is currently only displayed if LogLevel >=1 in [AssetCache] config 2013-10-30 18:57:51 +00:00
Justin Clark-Casey (justincc)
28f36d8db5 Put fcache commands output to console, not log 2013-10-30 18:32:53 +00:00
Robert Adams
2be0347f50 Merge branch 'master' into varregion 2013-10-28 09:30:26 -07:00
Justin Clark-Casey (justincc)
31989bd51e Show texture ids for full object/part info console commmds 2013-10-24 21:29:57 +01:00
Robert Adams
8937a2244d Merge branch 'master' into varregion 2013-10-16 07:53:44 -07:00
Robert Adams
97bc5263de varregion: move the compressed heighmap compression factor from 
Constants into TerrainData.
Save compression factor with the terrain blob in the database.
 2013-10-16 07:52:30 -07:00
Oren Hurvitz
d0c1780839 Fixed rezzing coalesced objects from a prim's inventory 
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
 2013-10-15 23:59:16 +01:00
Oren Hurvitz
f106ba87ca Made terrain uploads thread-safe 2013-10-15 00:12:56 +01:00