ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-31 23:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,889 Commits 5 Branches 93 Tags
e1b2ecdfdc5d465ee86d2a726eff2e504c846e79
Commit Graph

4022 Commits

Author SHA1 Message Date
Melanie Thielker
e1b2ecdfdc Merge branch 'avination-current' 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
 2014-07-19 22:32:07 +02:00
UbitUmarov
19d33c571d Merge branch 'avination-current' into ubitwork 2014-07-16 16:22:32 +01:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Melanie Thielker
5908e7d0c2 Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e' 2014-06-21 00:22:51 +02:00
Melanie Thielker
d97896d39a Differentiate between requests only the owner should be able to do and those 
that managers can do when setting parcel data
 2014-04-26 20:32:27 +02:00
Justin Clark-Casey (justincc)
c77cd6adc7 minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28 2014-04-23 22:59:28 +01:00
Dev Random
fb321a0573 Prevent sending Land Properties for unprivileged users 2014-04-23 22:59:13 +01:00
Melanie Thielker
bb841ea9ce Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins 2014-04-06 23:22:37 +02:00
Melanie Thielker
17aeec8860 Reinstate the timed region change signal 2014-03-25 03:16:37 +01:00
Melanie
c6e9db5866 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Justin Clark-Casey (justincc)
966ab21839 Merge branch 'justincc-master' 2014-01-24 00:17:39 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
2cf7478b9a Merge branch 'justincc-master' 2014-01-20 19:34:55 +00:00
Justin Clark-Casey (justincc)
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
Oren Hurvitz
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
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)
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
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
Melanie
e79fab91db Intermediate commit. Sill errors. 
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
 2014-01-05 20:12:32 +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
BlueWall
141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05: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
Melanie
958a8f274b Revert "Add support for user preferences (im via email)" 
This reverts commit 1842388bb4.
 2013-12-07 01:29:15 +00:00
Melanie
ba48816fb6 Merge branch 'master' into careminster 2013-12-07 01:19:20 +00:00
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00: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
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
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00