ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
ba0819be9ee4574e9cc5c05e94d21b449debba0a
opensim/OpenSim/Framework
History
Melanie ba0819be9e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-02-27 20:40:48 +00:00
..
AssetLoader/Filesystem
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Client
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
Communications
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Configuration
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
Console
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Monitoring
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
RegionLoader
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
Serialization
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Servers
Merge branch 'master' into careminster
2013-02-27 20:40:48 +00:00
Tests
Merge branch 'master' into careminster
2012-12-07 03:49:04 +00:00
AgentCircuitData.cs
Extend "show circuits" to show circuit code, ip and viewer name.
2012-07-12 23:09:36 +01:00
AgentCircuitManager.cs
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
AgentUpdateArgs.cs
…
Animation.cs
…
AssemblyInfo.cs
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
AssetBase.cs
add assettype mesh to list of binary assets
2012-09-26 20:31:34 +01:00
AssetLandmark.cs
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
AssetPermissions.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
AssetRequestToClient.cs
…
AuthenticateResponse.cs
…
AvatarAppearance.cs
* Document the additional Visual Params of newer browsers in AvatarAppearance.VPElement so it can be easily looked up in code/module
2013-01-14 19:37:44 -05:00
AvatarAttachment.cs
Stop NPCs losing attachments when the source avatar takes them off.
2011-09-03 01:11:16 +01:00
AvatarPickerAvatar.cs
…
AvatarPickerReplyAgentDataArgs.cs
…
AvatarPickerReplyDataArgs.cs
…
AvatarWearable.cs
revert last add commit
2012-04-26 18:24:36 +01:00
AvatarWearingArgs.cs
…
BlockingQueue.cs
…
Cache.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
CapsUtil.cs
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
ChatTypeEnum.cs
…
ChildAgentDataUpdate.cs
Merge branch 'master' into careminster
2012-10-31 00:13:33 +00:00
ClientInfo.cs
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
ClientManager.cs
…
CnmMemoryCache.cs
…
CnmSynchronizedCache.cs
…
ColliderData.cs
…
ConfigSettings.cs
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
ConfigurationMember.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
ConfigurationOption.cs
…
Constants.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
Culture.cs
…
DAMap.cs
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 17:32:57 -08:00
DoubleDictionaryThreadAbortSafe.cs
Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts.
2012-12-07 00:47:04 +00:00
EstateBan.cs
…
EstateSettings.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
EventData.cs
…
ExtraPhysicsData.cs
Partial port of Avination's support for the new physics parameters.
2013-02-06 08:03:04 +00:00
ForeignUserProfileData.cs
…
FriendListItem.cs
…
GcNotify.cs
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
GridInstantMessage.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
GroupData.cs
…
IAssetLoader.cs
…
IClientAPI.cs
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
ICnmCache.cs
…
ICommandConsole.cs
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
IConsole.cs
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
IGenericConfig.cs
…
IImprovedAssetCache.cs
add a Check method to flotsamAssetCache, so to check if a asset is in
2012-12-13 02:55:36 +00:00
ILandChannel.cs
remove now unused individual LandData prim counts.
2011-04-05 21:25:54 +01:00
ILandObject.cs
check land permitions on sit target for unscripted sits
2013-01-03 14:27:21 +00:00
IMoneyModule.cs
Add a transaction ID to the money module path for llTransferLindenDollars
2012-12-03 19:34:22 +01:00
InventoryCollection.cs
…
InventoryFolderBase.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
InventoryFolderImpl.cs
Remove manually permissions settings on all current library items so that they use the defaults instead.
2011-07-23 02:13:11 +01:00
InventoryItemBase.cs
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
2012-11-17 01:23:29 +00:00
InventoryNodeBase.cs
…
IPlugin.cs
…
IPrimCounts.cs
(re)implement selected prim count.
2011-03-30 00:13:07 +01:00
IRegionCreator.cs
…
IRegionLoader.cs
…
IRegistryCore.cs
…
IScene.cs
Make SceneManager.OnRegionsReadyStatusChange event available.
2012-07-25 21:00:59 +01:00
ISceneAgent.cs
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
2012-06-12 02:43:33 +01:00
ISceneEntity.cs
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
2011-12-17 02:23:24 +00:00
ISceneObject.cs
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
2011-12-17 02:23:24 +00:00
LandData.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
LandStatReportItem.cs
…
LandUpdateArgs.cs
…
Lazy.cs
…
Location.cs
…
LocklessQueue.cs
Add a way to put things at the front of the queue for any throttle group.
2013-01-16 19:29:27 +01:00
Login.cs
…
MainConsole.cs
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
2011-10-25 20:24:21 +01:00
MapAndArray.cs
…
MapBlockData.cs
…
MapItemReplyStruct.cs
…
MinHeap.cs
Commiting Avination's memleak fix-a-thon, installment #1
2012-07-23 19:21:59 +01:00
MultipartForm.cs
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
2012-03-12 10:07:04 -07:00
NetworkServersInfo.cs
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
NetworkUtil.cs
…
ObjectChangeData.cs
Refactor, move OjectChangeData into it's own file and rename
2012-03-13 13:08:32 +01:00
OSChatMessage.cs
Revert "Mantis 5977 Corrections to llRegionSayTo"
2012-06-28 22:02:20 +01:00
ParcelMediaCommandEnum.cs
…
PluginLoader.cs
…
PluginManager.cs
Hide some console output when initializing addin repository
2012-12-11 17:03:42 -05:00
Pool.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
PresenceType.cs
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
2011-08-18 00:53:05 +01:00
PrimeNumberHelper.cs
…
PrimitiveBaseShape.cs
Merge branch 'master' into careminster
2013-02-10 00:17:14 +00:00
PriorityQueue.cs
fix priorityQueue to correctly use the fairness counts starting at 8 for
2012-09-26 00:17:54 +01:00
RegionFlags.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
RegionHandshakeArgs.cs
…
RegionInfo.cs
Merge branch 'master' into careminster
2013-01-31 20:16:45 +00:00
RegionInfoForEstateMenuArgs.cs
…
RegionSettings.cs
Merge branch 'master' into careminster
2012-05-14 23:32:49 +01:00
RegistryCore.cs
…
RequestAssetArgs.cs
…
SimStats.cs
…
SLUtil.cs
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
SurfaceTouchEventArgs.cs
…
TaskInventoryDictionary.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
TaskInventoryItem.cs
Revert "Merge master into teravuswork", it should have been avination, not master.
2012-11-15 10:05:16 -05:00
TextureRequestArgs.cs
…
ThrottleOutPacketType.cs
Add a way to put things at the front of the queue for any throttle group.
2013-01-16 19:29:27 +01:00
UntrustedWebRequest.cs
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."
2012-09-30 07:48:03 -07:00
UpdateShapeArgs.cs
…
UserAgentData.cs
…
UserProfileData.cs
…
Util.cs
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
ViewerEffectEventHandlerArg.cs
…
WearableCacheItem.cs
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
WebUtil.cs
Merge branch 'master' into careminster
2013-02-27 18:05:04 +00:00