OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,095 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

17095 Commits (30b2fc6aeaffda2bbdc4a5ce76011b9e9e807b2f)

Author SHA1 Message Date
Melanie 30b2fc6aea Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge 2011-10-12 01:29:47 +01:00
Melanie f8016a730e Merge commit '8a216dc1ccdc336a22958cd476de034d065cf676' into bigmerge 2011-10-12 01:29:37 +01:00
Melanie e3f6344f54 Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge 2011-10-12 01:29:31 +01:00
Melanie 59e3ac1ec6 Fix rezzing coalesced object broken by core merge 2011-10-12 00:50:13 +02:00
Melanie 1c2b5d99c9 Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge 2011-10-12 00:10:15 +02:00
Melanie e4f3ba8610 Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-12 00:10:30 +01:00
Melanie 29c31983d8 Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge 2011-10-11 23:32:46 +01:00
Melanie a9af618842 Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-11 23:32:16 +01:00
Melanie 0b96991ab4 Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge 2011-10-11 23:28:16 +01:00
Melanie b8e22b25fd Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2011-10-11 23:28:06 +01:00
Melanie 1ca86114e1 Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge 2011-10-11 23:22:23 +01:00
Melanie 3359bafc3e Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge 2011-10-11 23:22:08 +01:00
Melanie 57c6d79b62 Merge commit '34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c' into bigmerge 2011-10-11 23:21:58 +01:00
Melanie 1b3ea64fe9 Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-11 23:21:36 +01:00
Melanie ef9a811ea6 Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-11 23:17:47 +01:00
Melanie 1556389913 Merge commit '31125a5fd275a37261d87a336385f5447a62004e' into bigmerge 2011-10-11 23:16:53 +01:00
Melanie 7891433148 Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge 2011-10-11 23:16:43 +01:00
Melanie 0ae63d0e8b Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge 
Conflicts:
	OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
	OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
 2011-10-11 23:16:19 +01:00
Melanie efaa113fb9 Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge 2011-10-11 23:15:41 +01:00
Melanie 95a1a804bf Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge 2011-10-11 23:15:29 +01:00
Melanie ae67eb0a1f Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge 2011-10-11 23:15:17 +01:00
Melanie ae8504f8d9 Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge 2011-10-11 23:15:00 +01:00
Melanie 20a2b5d63c Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge 2011-10-11 23:14:54 +01:00
Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2011-10-11 23:14:23 +01:00
Melanie 61a8e35b7d Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge 2011-10-11 23:08:38 +01:00
Melanie b9826035f6 Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge 2011-10-11 23:08:18 +01:00
Melanie a157fdedcf Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-10-11 23:08:07 +01:00
Melanie 66c06c5685 Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge 2011-10-11 23:02:19 +01:00
Melanie ea8350a526 Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge 2011-10-11 23:02:04 +01:00
Melanie 5536cdf90c Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
 2011-10-11 23:01:52 +01:00
Melanie ed1bb2081e Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge 2011-10-11 22:54:03 +01:00
Melanie 308b6937ad Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge 2011-10-11 22:53:53 +01:00
Melanie d8b78ca498 Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge 2011-10-11 22:53:38 +01:00
Melanie fbe9216695 Merge commit 'def74404f1ea6b2a0f479c602fd67bcfced41426' into bigmerge 2011-10-11 22:53:30 +01:00
Melanie 83ec064868 Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2011-10-11 22:53:27 +01:00
Melanie 1b2849319c Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge 2011-10-11 22:52:15 +01:00
Melanie b40157fc9b Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
 2011-10-11 22:51:44 +01:00
Melanie 7c897ef2a1 Merge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmerge 2011-10-11 22:45:21 +01:00
Melanie 75fd256ef8 Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge 2011-10-11 22:43:27 +01:00
Melanie 2048976a6e Merge commit '28a482a7ee2cebab1aa720477af175d7e26d702e' into bigmerge 2011-10-11 22:43:01 +01:00
Melanie 833420e167 Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge 2011-10-11 22:42:51 +01:00
Melanie 652c59c0a9 Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge 2011-10-11 22:42:18 +01:00
Melanie 2e47d24832 Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-11 22:41:51 +01:00
Melanie a671fcfd2c Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge 2011-10-11 22:33:58 +01:00
Melanie e3450da66c Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:33:53 +01:00
Melanie 67e7f25d6c Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge 2011-10-11 22:32:21 +01:00
Melanie 6101de2316 Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:32:10 +01:00
Melanie 9935eb6578 Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge 2011-10-11 22:26:18 +01:00
Melanie a4ba99f020 Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge 2011-10-11 22:25:03 +01:00
Melanie 6e6c70be15 Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge 2011-10-11 22:24:40 +01:00